I have implemented the fixes, but am currently seeing 2 failing unit tests;

org.hibernate.test.cache.ReferenceCacheTest > testUseOfDirectReferencesInCache

org.hibernate.test.cache.ByteCodeEnhancedImmutableReferenceCacheTest > testUseOfDirectReferencesInCache

I am currently unable to run the unit tests from intellij, I need to debug to understand why the tests are failing.