Progress: I had a PR which implements 1# as that was my preference:

• https://github.com/hibernate/hibernate-orm/pull/3389

Steve suggested that 2# would be a better approach though, so I’ll try to implement that next.

There’s more interesting feedback on the above PR; Christian suggests the cache implementation could give a hint on what’s more efficient to do.