Roger Dearnaley I posted a proposal here: https://github.com/hibernate/hibernate-orm/pull/2367

We really need a test case to be able to validate it improves the situation.

We have one more map lookup and one more object creation in the hot path so I prefer to be cautious.