HHH-9629 - l2 cache key constructed wrong for entity with inheritance when fetching lazy property

Author: sebersole

hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java

@@ -205,7 +205,7 @@ private boolean isCached(EntityKey entityKey, EntityPersister persister) {
 			final CacheKey key = context.getSession().generateCacheKey(
 					entityKey.getIdentifier(),
 					persister.getIdentifierType(),
-					entityKey.getEntityName()
+					persister.getRootEntityName()
 			);
 			return CacheHelper.fromSharedCache( context.getSession(), key, persister.getCacheAccessStrategy() ) != null;
 		}

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -906,7 +906,7 @@ public Object initializeLazyProperty(String fieldName, Object entity, SessionImp
 		}
 
 		if ( session.getCacheMode().isGetEnabled() && hasCache() ) {
-			final CacheKey cacheKey = session.generateCacheKey( id, getIdentifierType(), getEntityName() );
+			final CacheKey cacheKey = session.generateCacheKey( id, getIdentifierType(), getRootEntityName() );
 			final Object ce = CacheHelper.fromSharedCache( session, cacheKey, getCacheAccessStrategy() );
 			if ( ce != null ) {
 				final CacheEntry cacheEntry = (CacheEntry) getCacheEntryStructure().destructure( ce, factory );