@Steve, Ill give it a spin and try the idea on on 5.0

@Christian currently a ServiceFactory is used to obtain the bundle that's creating an EntityManager the ClassLoader of that bundle (the requestingBundle) is added to the OsgiClassLoader. But I think it you are right and using the ClassLoader from the PersistenceUnitInfo would be even better.