Would really love to "discriminate" the types of services expected/allowed in each. For example, "basic" or "non-contextual" services would live in one registry while services which require access to or are better implemented as scoped to the session factory would live in a second. The basic registry would be the parent of the SessionFactory-specific one.

I went dow this path:

but started running into typing issues way beyond my skills.