I looked at your branch shallowly. It looks good. Something in me makes me avoid using the SessionFactoryObserver as I see it as a hack but I have no ground. another possible solution is to use a SessionFactory aware Service but as we've seen in OGM you need to override the default SessionFactory service registry initiator today.