HHH-15790 Make HibernateProxy also type-cache friendly

hibernate-core/src/main/java/org/hibernate/Hibernate.java

@@ -35,7 +35,9 @@
 import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.collection.spi.LazyInitializable;
 
+import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
 import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
 import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
 
 /**
@@ -126,8 +128,8 @@ public static void initialize(Object proxy) throws HibernateException {
 			return;
 		}
 
-		if ( proxy instanceof HibernateProxy ) {
+		if ( isHibernateProxy( proxy ) ) {
-			( (HibernateProxy) proxy ).getHibernateLazyInitializer().initialize();
+			asHibernateProxy( proxy ).getHibernateLazyInitializer().initialize();
 		}
 		else if ( proxy instanceof LazyInitializable ) {
 			( (LazyInitializable) proxy ).forceInitialization();
@@ -149,8 +151,9 @@ else if ( isPersistentAttributeInterceptable( proxy ) ) {
 	 * @return true if the argument is already initialized, or is not a proxy or collection
 	 */
 	public static boolean isInitialized(Object proxy) {
-		if ( proxy instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( proxy );
-			return !( (HibernateProxy) proxy ).getHibernateLazyInitializer().isUninitialized();
+		if ( lazyInitializer != null ) {
+			return !lazyInitializer.isUninitialized();
 		}
 		else if ( isPersistentAttributeInterceptable( proxy ) ) {
 			final PersistentAttributeInterceptor interceptor = asPersistentAttributeInterceptable( proxy ).$$_hibernate_getInterceptor();
@@ -241,8 +244,9 @@ public static <T> T get(List<T> list, int key) {
 	@SuppressWarnings("unchecked")
 	public static <T> Class<? extends T> getClass(T proxy) {
 		Class<?> result;
-		if ( proxy instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( proxy );
-			result = ( (HibernateProxy) proxy ).getHibernateLazyInitializer()
+		if ( lazyInitializer != null ) {
+			result = lazyInitializer
 					.getImplementation()
 					.getClass();
 		}
@@ -280,13 +284,13 @@ public static boolean isInstance(Object proxy, Class<?> entityClass) {
 	 */
 	public static boolean isPropertyInitialized(Object proxy, String propertyName) {
 		final Object entity;
-		if ( proxy instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( proxy );
-			final LazyInitializer li = ( (HibernateProxy) proxy ).getHibernateLazyInitializer();
+		if ( lazyInitializer != null ) {
-			if ( li.isUninitialized() ) {
+			if ( lazyInitializer.isUninitialized() ) {
 				return false;
 			}
 			else {
-				entity = li.getImplementation();
+				entity = lazyInitializer.getImplementation();
 			}
 		}
 		else {
@@ -315,8 +319,8 @@ public static boolean isPropertyInitialized(Object proxy, String propertyName) {
 	 * uninitialized proxy that is not associated with an open session.
      */
 	public static Object unproxy(Object proxy) {
-		if ( proxy instanceof HibernateProxy ) {
+		if ( isHibernateProxy( proxy ) ) {
-			HibernateProxy hibernateProxy = (HibernateProxy) proxy;
+			HibernateProxy hibernateProxy = asHibernateProxy( proxy );
 			LazyInitializer initializer = hibernateProxy.getHibernateLazyInitializer();
 			return initializer.getImplementation();
 		}

hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java

@@ -6,6 +6,7 @@
  */
 package org.hibernate.bytecode.internal.bytebuddy;
 
+import static net.bytebuddy.matcher.ElementMatchers.anyOf;
 import static net.bytebuddy.matcher.ElementMatchers.isFinalizer;
 import static net.bytebuddy.matcher.ElementMatchers.isSynthetic;
 import static net.bytebuddy.matcher.ElementMatchers.isVirtual;
@@ -26,6 +27,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
 import org.hibernate.bytecode.spi.BasicProxyFactory;
+import org.hibernate.engine.spi.PrimeAmongSecondarySupertypes;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.securitymanager.SystemSecurityManager;
 import org.hibernate.proxy.ProxyConfiguration;

hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractEntityEntry.java

@@ -34,6 +34,7 @@
 import org.hibernate.proxy.HibernateProxy;
 
 import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
 import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
 
 /**
@@ -347,9 +348,8 @@ private boolean isUnequivocallyNonDirty(Object entity) {
 					return !enhancementAsProxyLazinessInterceptor.hasWrittenFieldNames();
 				}
 			}
-			else if ( entity instanceof HibernateProxy ) {
+			else if ( isHibernateProxy( entity ) ) {
-				uninitializedProxy = ( (HibernateProxy) entity ).getHibernateLazyInitializer()
+				uninitializedProxy = HibernateProxy.extractLazyInitializer( entity ).isUninitialized();
-						.isUninitialized();
 			}
 			// we never have to check an uninitialized proxy
 			return uninitializedProxy || !persister.hasCollections()

hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java

@@ -21,6 +21,8 @@
 import org.hibernate.type.EntityType;
 import org.hibernate.type.Type;
 
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
+
 /**
  * Algorithms related to foreign key constraint transparency
  *
@@ -198,20 +200,20 @@ private boolean isNullifiable(final String entityName, Object object)
 
 			final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
 
-			if ( object instanceof HibernateProxy ) {
+			final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
+			if ( lazyInitializer != null ) {
 				// if it's an uninitialized proxy it can only be
 				// transient if we did an unloaded-delete on the
 				// proxy itself, in which case there is no entry
 				// for it, but its key has already been registered
 				// as nullifiable
-				final LazyInitializer li = ( (HibernateProxy) object ).getHibernateLazyInitializer();
+				Object entity = lazyInitializer.getImplementation( session );
-				Object entity = li.getImplementation( session );
 				if ( entity == null ) {
 					return persistenceContext.containsDeletedUnloadedEntityKey(
 							session.generateEntityKey(
-									li.getIdentifier(),
+									lazyInitializer.getIdentifier(),
 									session.getFactory().getRuntimeMetamodels().getMappingMetamodel()
-											.getEntityDescriptor( li.getEntityName() )
+											.getEntityDescriptor( lazyInitializer.getEntityName() )
 							)
 					);
 				}
@@ -255,7 +257,7 @@ private boolean isNullifiable(final String entityName, Object object)
 	 * @return {@code true} if the given entity is not transient (meaning it is either detached/persistent)
 	 */
 	public static boolean isNotTransient(String entityName, Object entity, Boolean assumed, SharedSessionContractImplementor session) {
-		return entity instanceof HibernateProxy
+		return isHibernateProxy( entity )
 			|| session.getPersistenceContextInternal().isEntryFor( entity )
 			// todo : shouldn't assumed be reversed here?
 			|| !isTransient( entityName, entity, assumed, session );

hibernate-core/src/main/java/org/hibernate/engine/internal/ManagedTypeHelper.java

@@ -14,6 +14,7 @@
 import org.hibernate.engine.spi.ManagedMappedSuperclass;
 import org.hibernate.engine.spi.PersistentAttributeInterceptable;
 import org.hibernate.engine.spi.SelfDirtinessTracker;
+import org.hibernate.proxy.HibernateProxy;
 
 import java.util.Objects;
 import java.util.function.BiConsumer;
@@ -106,6 +107,18 @@ public static boolean isManagedEntity(final Object entity) {
 		return false;
 	}
 
+	/**
+	 * @param entity
+	 * @return true if and only if the entity implements {@see HibernateProxy}
+	 */
+	public static boolean isHibernateProxy(final Object entity) {
+		if ( entity instanceof PrimeAmongSecondarySupertypes ) {
+			PrimeAmongSecondarySupertypes t = (PrimeAmongSecondarySupertypes) entity;
+			return t.asHibernateProxy() != null;
+		}
+		return false;
+	}
+
 	/**
 	 * @param entity
 	 * @return true if and only if the entity implements {@see PersistentAttributeInterceptable}

hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java

@@ -68,8 +68,10 @@
 
 import org.jboss.logging.Logger;
 
+import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
 import static org.hibernate.engine.internal.ManagedTypeHelper.asManagedEntity;
 import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
 import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
 
 /**
@@ -228,7 +230,7 @@ public void clear() {
 		if ( proxiesByKey != null ) {
 			proxiesByKey.forEach( (k,o) -> {
 				if ( o != null) {
-					((HibernateProxy) o).getHibernateLazyInitializer().unsetSession();
+					HibernateProxy.extractLazyInitializer( o ).unsetSession();
 				}
 			} );
 		}
@@ -600,8 +602,8 @@ public boolean reassociateIfUninitializedProxy(Object value) throws MappingExcep
 		if ( ! Hibernate.isInitialized( value ) ) {
 
 			// could be a proxy....
-			if ( value instanceof HibernateProxy ) {
+			if ( isHibernateProxy( value ) ) {
-				final HibernateProxy proxy = (HibernateProxy) value;
+				final HibernateProxy proxy = asHibernateProxy( value );
 				final LazyInitializer li = proxy.getHibernateLazyInitializer();
 				reassociateProxy( li, proxy );
 				return true;
@@ -624,9 +626,9 @@ public boolean reassociateIfUninitializedProxy(Object value) throws MappingExcep
 
 	@Override
 	public void reassociateProxy(Object value, Object id) throws MappingException {
-		if ( value instanceof HibernateProxy ) {
+		if ( isHibernateProxy( value ) ) {
 			LOG.debugf( "Setting proxy identifier: %s", id );
-			final HibernateProxy proxy = (HibernateProxy) value;
+			final HibernateProxy proxy = asHibernateProxy( value );
 			final LazyInitializer li = proxy.getHibernateLazyInitializer();
 			li.setIdentifier( id );
 			reassociateProxy( li, proxy );
@@ -654,8 +656,8 @@ private void reassociateProxy(LazyInitializer li, HibernateProxy proxy) {
 
 	@Override
 	public Object unproxy(Object maybeProxy) throws HibernateException {
-		if ( maybeProxy instanceof HibernateProxy ) {
+		if ( isHibernateProxy( maybeProxy ) ) {
-			final HibernateProxy proxy = (HibernateProxy) maybeProxy;
+			final HibernateProxy proxy = asHibernateProxy( maybeProxy );
 			final LazyInitializer li = proxy.getHibernateLazyInitializer();
 			if ( li.isUninitialized() ) {
 				throw new PersistentObjectException(
@@ -672,8 +674,8 @@ public Object unproxy(Object maybeProxy) throws HibernateException {
 
 	@Override
 	public Object unproxyAndReassociate(Object maybeProxy) throws HibernateException {
-		if ( maybeProxy instanceof HibernateProxy ) {
+		if ( isHibernateProxy( maybeProxy ) ) {
-			final HibernateProxy proxy = (HibernateProxy) maybeProxy;
+			final HibernateProxy proxy = asHibernateProxy( maybeProxy );
 			final LazyInitializer li = proxy.getHibernateLazyInitializer();
 			reassociateProxy( li, proxy );
 			//initialize + unwrap the object and return it
@@ -722,7 +724,7 @@ public Object narrowProxy(Object proxy, EntityPersister persister, EntityKey key
 
 			// Similarly, if the original HibernateProxy is initialized, there
 			// is again no point in creating a proxy.  Just return the impl
-			final HibernateProxy originalHibernateProxy = (HibernateProxy) proxy;
+			final HibernateProxy originalHibernateProxy = asHibernateProxy( proxy );
 			if ( !originalHibernateProxy.getHibernateLazyInitializer().isUninitialized() ) {
 				final Object impl = originalHibernateProxy.getHibernateLazyInitializer().getImplementation();
 				// can we return it?
@@ -734,7 +736,7 @@ public Object narrowProxy(Object proxy, EntityPersister persister, EntityKey key
 
 
 			// Otherwise, create the narrowed proxy
-			final HibernateProxy narrowedProxy = (HibernateProxy) persister.createProxy( key.getIdentifier(), session );
+			final HibernateProxy narrowedProxy = asHibernateProxy( persister.createProxy( key.getIdentifier(), session ) );
 
 			// set the read-only/modifiable mode in the new proxy to what it was in the original proxy
 			final boolean readOnlyOrig = originalHibernateProxy.getHibernateLazyInitializer().isReadOnly();
@@ -744,7 +746,7 @@ public Object narrowProxy(Object proxy, EntityPersister persister, EntityKey key
 		}
 		else {
 			if ( object != null ) {
-				final LazyInitializer li = ( (HibernateProxy) proxy ).getHibernateLazyInitializer();
+				final LazyInitializer li = asHibernateProxy( proxy ).getHibernateLazyInitializer();
 				li.setImplementation( object );
 			}
 			return proxy;
@@ -1316,8 +1318,8 @@ && isFoundInParent( propertyName, childEntity, persister, collectionPersister, p
 		if ( mergeMap != null ) {
 			for ( Object o : mergeMap.entrySet() ) {
 				final Entry<?,?> mergeMapEntry = (Entry<?,?>) o;
-				if ( mergeMapEntry.getKey() instanceof HibernateProxy ) {
+				if ( isHibernateProxy( mergeMapEntry.getKey() ) ) {
-					final HibernateProxy proxy = (HibernateProxy) mergeMapEntry.getKey();
+					final HibernateProxy proxy = asHibernateProxy( mergeMapEntry.getKey() );
 					if ( persister.isSubclassEntityName( proxy.getHibernateLazyInitializer().getEntityName() ) ) {
 						boolean found = isFoundInParent(
 								propertyName,
@@ -1480,8 +1482,9 @@ public boolean isReadOnly(Object entityOrProxy) {
 			throw new AssertionFailure( "object must be non-null." );
 		}
 		boolean isReadOnly;
-		if ( entityOrProxy instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entityOrProxy );
-			isReadOnly = ( (HibernateProxy) entityOrProxy ).getHibernateLazyInitializer().isReadOnly();
+		if ( lazyInitializer != null ) {
+			isReadOnly = lazyInitializer.isReadOnly();
 		}
 		else {
 			final EntityEntry ee =  getEntry( entityOrProxy );
@@ -1501,8 +1504,8 @@ public void setReadOnly(Object object, boolean readOnly) {
 		if ( isReadOnly( object ) == readOnly ) {
 			return;
 		}
-		if ( object instanceof HibernateProxy ) {
+		if ( isHibernateProxy( object ) ) {
-			final HibernateProxy proxy = (HibernateProxy) object;
+			final HibernateProxy proxy = asHibernateProxy( object );
 			setProxyReadOnly( proxy, readOnly );
 			if ( Hibernate.isInitialized( proxy ) ) {
 				setEntityReadOnly(
@@ -1516,8 +1519,8 @@ public void setReadOnly(Object object, boolean readOnly) {
 			// PersistenceContext.proxyFor( entity ) returns entity if there is no proxy for that entity
 			// so need to check the return value to be sure it is really a proxy
 			final Object maybeProxy = getSession().getPersistenceContextInternal().proxyFor( object );
-			if ( maybeProxy instanceof HibernateProxy ) {
+			if ( isHibernateProxy( maybeProxy ) ) {
-				setProxyReadOnly( (HibernateProxy) maybeProxy, readOnly );
+				setProxyReadOnly( asHibernateProxy( maybeProxy ), readOnly );
 			}
 		}
 	}
@@ -1689,7 +1692,8 @@ public static StatefulPersistenceContext deserialize(
 			rtn.hasNonReadOnlyEntities = ois.readBoolean();
 
 			int count = ois.readInt();
-			if ( LOG.isTraceEnabled() ) {
+			final boolean traceEnabled = LOG.isTraceEnabled();
+			if ( traceEnabled ) {
 				LOG.trace( "Starting deserialization of [" + count + "] entitiesByKey entries" );
 			}
 			rtn.entitiesByKey = CollectionHelper.mapOfSize(Math.max(count, INIT_COLL_SIZE));
@@ -1698,7 +1702,7 @@ public static StatefulPersistenceContext deserialize(
 			}
 
 			count = ois.readInt();
-			if ( LOG.isTraceEnabled() ) {
+			if ( traceEnabled ) {
 				LOG.trace( "Starting deserialization of [" + count + "] entitiesByUniqueKey entries" );
 			}
 			if ( count != 0 ) {
@@ -1709,26 +1713,27 @@ public static StatefulPersistenceContext deserialize(
 			}
 
 			count = ois.readInt();
-			if ( LOG.isTraceEnabled() ) {
+			if ( traceEnabled ) {
 				LOG.trace( "Starting deserialization of [" + count + "] proxiesByKey entries" );
 			}
 			for ( int i = 0; i < count; i++ ) {
 				final EntityKey ek = EntityKey.deserialize( ois, sfi );
 				final Object proxy = ois.readObject();
-				if ( proxy instanceof HibernateProxy ) {
+				final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( proxy );
-					( (HibernateProxy) proxy ).getHibernateLazyInitializer().setSession( session );
+				if ( lazyInitializer != null ) {
+					lazyInitializer.setSession( session );
 					rtn.getOrInitializeProxiesByKey().put( ek, proxy );
 				}
 				else {
 					// otherwise, the proxy was pruned during the serialization process
-					if ( LOG.isTraceEnabled() ) {
+					if ( traceEnabled ) {
 						LOG.trace( "Encountered pruned proxy" );
 					}
 				}
 			}
 
 			count = ois.readInt();
-			if ( LOG.isTraceEnabled() ) {
+			if ( traceEnabled ) {
 				LOG.trace( "Starting deserialization of [" + count + "] entitySnapshotsByKey entries" );
 			}
 			rtn.entitySnapshotsByKey = CollectionHelper.mapOfSize(Math.max(count, INIT_COLL_SIZE));
@@ -1739,7 +1744,7 @@ public static StatefulPersistenceContext deserialize(
 			rtn.entityEntryContext = EntityEntryContext.deserialize( ois, rtn );
 
 			count = ois.readInt();
-			if ( LOG.isTraceEnabled() ) {
+			if ( traceEnabled ) {
 				LOG.trace( "Starting deserialization of [" + count + "] collectionsByKey entries" );
 			}
 			rtn.collectionsByKey = CollectionHelper.mapOfSize(Math.max(count, INIT_COLL_SIZE));
@@ -1751,7 +1756,7 @@ public static StatefulPersistenceContext deserialize(
 			}
 
 			count = ois.readInt();
-			if ( LOG.isTraceEnabled() ) {
+			if ( traceEnabled ) {
 				LOG.trace( "Starting deserialization of [" + count + "] collectionEntries entries" );
 			}
 			for ( int i = 0; i < count; i++ ) {
@@ -1762,7 +1767,7 @@ public static StatefulPersistenceContext deserialize(
 			}
 
 			count = ois.readInt();
-			if ( LOG.isTraceEnabled() ) {
+			if ( traceEnabled ) {
 				LOG.trace( "Starting deserialization of [" + count + "] arrayHolders entries" );
 			}
 			if ( count != 0 ) {
@@ -1773,7 +1778,7 @@ public static StatefulPersistenceContext deserialize(
 			}
 
 			count = ois.readInt();
-			if ( LOG.isTraceEnabled() ) {
+			if ( traceEnabled ) {
 				LOG.trace( "Starting deserialization of [" + count + "] nullifiableEntityKey entries" );
 			}
 			rtn.nullifiableEntityKeys = new HashSet<>();

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

@@ -844,10 +844,10 @@ public boolean hasAnyQueuedActions() {
 	}
 
 	public void unScheduleDeletion(EntityEntry entry, Object rescuedEntity) {
-		if ( rescuedEntity instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( rescuedEntity );
-			LazyInitializer initializer = ( (HibernateProxy) rescuedEntity ).getHibernateLazyInitializer();
+		if ( lazyInitializer != null ) {
-			if ( !initializer.isUninitialized() ) {
+			if ( !lazyInitializer.isUninitialized() ) {
-				rescuedEntity = initializer.getImplementation( session );
+				rescuedEntity = lazyInitializer.getImplementation( session );
 			}
 		}
 		if ( deletions != null ) {

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

@@ -7,6 +7,7 @@
 package org.hibernate.engine.spi;
 
 import org.hibernate.engine.internal.ManagedTypeHelper;
+import org.hibernate.proxy.HibernateProxy;
 
 /**
  * For a full explanation of the purpose of this interface
@@ -53,4 +54,8 @@ default CompositeTracker asCompositeTracker() {
 		return null;
 	}
 
+	default HibernateProxy asHibernateProxy() {
+		return null;
+	}
+
 }

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java

@@ -98,14 +98,13 @@ public void onDelete(DeleteEvent event, DeleteContext transientEntities) throws
 
 	private boolean optimizeUnloadedDelete(DeleteEvent event) {
 		final Object object = event.getObject();
-		if ( object instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
-			HibernateProxy proxy = (HibernateProxy) object;
+		if ( lazyInitializer != null ) {
-			LazyInitializer initializer = proxy.getHibernateLazyInitializer();
+			if ( lazyInitializer.isUninitialized() ) {
-			if ( initializer.isUninitialized() ) {
 				final EventSource source = event.getSession();
 				final EntityPersister persister = source.getFactory().getMappingMetamodel()
-						.findEntityDescriptor( initializer.getEntityName() );
+						.findEntityDescriptor( lazyInitializer.getEntityName() );
-				final Object id = initializer.getIdentifier();
+				final Object id = lazyInitializer.getIdentifier();
 				final EntityKey key = source.generateEntityKey( id, persister );
 				final PersistenceContext persistenceContext = source.getPersistenceContextInternal();
 				if ( !persistenceContext.containsEntity( key )

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java

@@ -47,25 +47,25 @@ public void onEvict(EvictEvent event) throws HibernateException {
 		if ( object == null ) {
 			throw new NullPointerException( "null passed to Session.evict()" );
 		}
-		if ( object instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
-			final LazyInitializer li = ( (HibernateProxy) object ).getHibernateLazyInitializer();
+		if ( lazyInitializer != null ) {
-			final Object id = li.getInternalIdentifier();
+			final Object id = lazyInitializer.getInternalIdentifier();
 			if ( id == null ) {
 				throw new IllegalArgumentException( "Could not determine identifier of proxy passed to evict()" );
 			}
 			final EntityPersister persister = source.getFactory()
 					.getMappingMetamodel()
-					.getEntityDescriptor( li.getEntityName() );
+					.getEntityDescriptor( lazyInitializer.getEntityName() );
 			final EntityKey key = source.generateEntityKey( id, persister );
 			persistenceContext.removeProxy( key );
-			if ( !li.isUninitialized() ) {
+			if ( !lazyInitializer.isUninitialized() ) {
 				final Object entity = persistenceContext.removeEntity( key );
 				if ( entity != null ) {
 					EntityEntry entry = persistenceContext.removeEntry( entity );
 					doEvict( entity, key, entry.getPersister(), event.getSession() );
 				}
 			}
-			li.unsetSession();
+			lazyInitializer.unsetSession();
 		}
 		else {
 			EntityEntry entry = persistenceContext.getEntry( object );

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java

@@ -6,8 +6,6 @@
  */
 package org.hibernate.event.internal;
 
-import java.util.List;
-
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.NonUniqueObjectException;
@@ -298,11 +296,8 @@ private static Object loadWithProxyFactory(LoadEvent event, EntityPersister pers
 			// existing proxy associated with the PC - and if so, use it
 			final Object proxy = persistenceContext.getProxy( keyToLoad );
 			if ( proxy != null ) {
-				if ( LOG.isTraceEnabled() ) {
+				LOG.trace( "Entity proxy found in session cache" );
-					LOG.trace( "Entity proxy found in session cache" );
+				if ( LOG.isDebugEnabled() && HibernateProxy.extractLazyInitializer( proxy ).isUnwrap() ) {
-				}
-				if ( LOG.isDebugEnabled()
-						&& ( (HibernateProxy) proxy ).getHibernateLazyInitializer().isUnwrap() ) {
 					LOG.debug( "Ignoring NO_PROXY to honor laziness" );
 				}
 				return persistenceContext.narrowProxy( proxy, persister, keyToLoad, null );
@@ -378,7 +373,7 @@ private Object narrowedProxy(LoadEvent event, EntityPersister persister, EntityK
 		if ( LOG.isTraceEnabled() ) {
 			LOG.trace( "Entity proxy found in session cache" );
 		}
-		final LazyInitializer li = ( (HibernateProxy) proxy ).getHibernateLazyInitializer();
+		LazyInitializer li = HibernateProxy.extractLazyInitializer( proxy );
 		if ( li.isUnwrap() ) {
 			return li.getImplementation();
 		}
@@ -601,8 +596,9 @@ protected Object loadFromDatasource(final LoadEvent event, final EntityPersister
 		//		persister/loader/initializer sensitive to this fact - possibly
 		//		passing LoadType along
 
-		if ( entity instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
-			entity = ( (HibernateProxy) entity ).getHibernateLazyInitializer().getImplementation();
+		if ( lazyInitializer != null ) {
+			entity = lazyInitializer.getImplementation();
 		}
 
 		final StatisticsImplementor statistics = event.getSession().getFactory().getStatistics();

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java

@@ -103,14 +103,14 @@ public void onMerge(MergeEvent event, MergeContext copiedAlready) throws Hiberna
 		// NOTE : `original` is the value being merged
 		if ( original != null ) {
 			final EventSource source = event.getSession();
-			if ( original instanceof HibernateProxy ) {
+			final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( original );
-				LazyInitializer li = ( (HibernateProxy) original ).getHibernateLazyInitializer();
+			if ( lazyInitializer != null ) {
-				if ( li.isUninitialized() ) {
+				if ( lazyInitializer.isUninitialized() ) {
 					LOG.trace( "Ignoring uninitialized proxy" );
-					event.setResult( source.load( li.getEntityName(), li.getInternalIdentifier() ) );
+					event.setResult( source.load( lazyInitializer.getEntityName(), lazyInitializer.getInternalIdentifier() ) );
 				}
 				else {
-					doMerge( event, copiedAlready, li.getImplementation() );
+					doMerge( event, copiedAlready, lazyInitializer.getImplementation() );
 				}
 			}
 			else if ( isPersistentAttributeInterceptable( original ) ) {

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java

@@ -62,15 +62,15 @@ public void onPersist(PersistEvent event) throws HibernateException {
 	 */
 	public void onPersist(PersistEvent event, PersistContext createCache) throws HibernateException {
 		final Object object = event.getObject();
-		if ( object instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
-			LazyInitializer li = ( (HibernateProxy) object ).getHibernateLazyInitializer();
+		if ( lazyInitializer != null ) {
-			if ( li.isUninitialized() ) {
+			if ( lazyInitializer.isUninitialized() ) {
-				if ( li.getSession() != event.getSession() ) {
+				if ( lazyInitializer.getSession() != event.getSession() ) {
 					throw new PersistentObjectException( "uninitialized proxy passed to persist()" );
 				}
 			}
 			else {
-				persist( event, createCache, li.getImplementation() );
+				persist( event, createCache, lazyInitializer.getImplementation() );
 			}
 		}
 		else {

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultSaveOrUpdateEventListener.java

@@ -32,6 +32,7 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
 
 /**
  * Defines the default listener used by Hibernate for handling save-update
@@ -57,8 +58,9 @@ public void onSaveOrUpdate(SaveOrUpdateEvent event) {
 		if ( requestedId != null ) {
 			//assign the requested id to the proxy, *before*
 			//reassociating the proxy
-			if ( object instanceof HibernateProxy ) {
+			final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
-				( (HibernateProxy) object ).getHibernateLazyInitializer().setIdentifier( requestedId );
+			if ( lazyInitializer != null ) {
+				lazyInitializer.setIdentifier( requestedId );
 			}
 		}
 

hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java

@@ -697,8 +697,8 @@ public RootGraphImplementor<?> findEntityGraphByName(String name) {
 
 	@Override
 	public String bestGuessEntityName(Object object) {
-		if ( object instanceof HibernateProxy ) {
+		final LazyInitializer initializer = HibernateProxy.extractLazyInitializer( object );
-			LazyInitializer initializer = ( (HibernateProxy) object ).getHibernateLazyInitializer();
+		if ( initializer != null ) {
 			// it is possible for this method to be called during flush processing,
 			// so make certain that we do not accidentally initialize an uninitialized proxy
 			if ( initializer.isUninitialized() ) {
@@ -1081,10 +1081,9 @@ public <T> BindableType<? extends T> resolveParameterBindType(T bindValue) {
 		}
 
 		Class<?> clazz;
-		if (bindValue instanceof HibernateProxy) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( bindValue );
-			HibernateProxy proxy = (HibernateProxy) bindValue;
+		if ( lazyInitializer != null ) {
-			LazyInitializer li = proxy.getHibernateLazyInitializer();
+			clazz = lazyInitializer.getPersistentClass();
-			clazz = li.getPersistentClass();
 		}
 		else {
 			clazz = bindValue.getClass();

hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java

@@ -162,6 +162,7 @@
 import static org.hibernate.cfg.AvailableSettings.JPA_LOCK_TIMEOUT;
 import static org.hibernate.cfg.AvailableSettings.JPA_SHARED_CACHE_RETRIEVE_MODE;
 import static org.hibernate.cfg.AvailableSettings.JPA_SHARED_CACHE_STORE_MODE;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
 import static org.hibernate.jpa.HibernateHints.HINT_READ_ONLY;
 import static org.hibernate.jpa.LegacySpecHints.HINT_JAVAEE_LOCK_TIMEOUT;
 import static org.hibernate.jpa.LegacySpecHints.HINT_JAVAEE_QUERY_TIMEOUT;
@@ -534,8 +535,9 @@ public LockMode getCurrentLockMode(Object object) throws HibernateException {
 			throw new NullPointerException( "null object passed to getCurrentLockMode()" );
 		}
 
-		if ( object instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
-			object = ( (HibernateProxy) object ).getHibernateLazyInitializer().getImplementation( this );
+		if ( lazyInitializer != null ) {
+			object = lazyInitializer.getImplementation( this );
 			if ( object == null ) {
 				return LockMode.NONE;
 			}
@@ -1034,8 +1036,9 @@ public Object immediateLoad(String entityName, Object id) throws HibernateExcept
 		fireLoadNoChecks( event, LoadEventListener.IMMEDIATE_LOAD );
 		Object result = event.getResult();
 		finishWithEventInstance( event );
-		if ( result instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( result );
-			return ( (HibernateProxy) result ).getHibernateLazyInitializer().getImplementation();
+		if ( lazyInitializer != null ) {
+			return lazyInitializer.getImplementation();
 		}
 		return result;
 	}
@@ -1496,12 +1499,12 @@ public EntityPersister getEntityPersister(final String entityName, final Object
 	public Object getIdentifier(Object object) throws HibernateException {
 		checkOpen();
 		checkTransactionSynchStatus();
-		if ( object instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
-			LazyInitializer li = ( (HibernateProxy) object ).getHibernateLazyInitializer();
+		if ( lazyInitializer != null ) {
-			if ( li.getSession() != this ) {
+			if ( lazyInitializer.getSession() != this ) {
 				throw new TransientObjectException( "The proxy was not associated with this session" );
 			}
-			return li.getInternalIdentifier();
+			return lazyInitializer.getInternalIdentifier();
 		}
 		else {
 			EntityEntry entry = persistenceContext.getEntry( object );
@@ -1529,7 +1532,13 @@ public Object getContextEntityIdentifier(Object object) {
 	}
 
 	private Object getProxyIdentifier(Object proxy) {
-		return ( (HibernateProxy) proxy ).getHibernateLazyInitializer().getInternalIdentifier();
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( proxy );
+		if ( lazyInitializer != null ) {
+			return lazyInitializer.getInternalIdentifier();
+		}
+		else {
+			throw new HibernateException( "Argument was not an HibernateProxy, which is a requirement for this method" );
+		}
 	}
 
 	@Override
@@ -1542,23 +1551,23 @@ public boolean contains(Object object) {
 		}
 
 		try {
-			if ( object instanceof HibernateProxy ) {
+			final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
+			if ( lazyInitializer != null ) {
 				//do not use proxiesByKey, since not all
 				//proxies that point to this session's
 				//instances are in that collection!
-				LazyInitializer li = ( (HibernateProxy) object ).getHibernateLazyInitializer();
+				if ( lazyInitializer.isUninitialized() ) {
-				if ( li.isUninitialized() ) {
 					//if it is an uninitialized proxy, pointing
 					//with this session, then when it is accessed,
 					//the underlying instance will be "contained"
-					return li.getSession() == this;
+					return lazyInitializer.getSession() == this;
 				}
 				else {
 					//if it is initialized, see if the underlying
 					//instance is contained, since we need to
 					//account for the fact that it might have been
 					//evicted
-					object = li.getImplementation();
+					object = lazyInitializer.getImplementation();
 				}
 			}
 
@@ -1569,7 +1578,7 @@ public boolean contains(Object object) {
 			delayedAfterCompletion();
 
 			if ( entry == null ) {
-				if ( !(object instanceof HibernateProxy) && persistenceContext.getEntry( object ) == null ) {
+				if ( ! ( isHibernateProxy( object ) ) && persistenceContext.getEntry( object ) == null ) {
 					// check if it is even an entity -> if not throw an exception (per JPA)
 					try {
 						final String entityName = getEntityNameResolver().resolveEntityName( object );
@@ -1620,11 +1629,11 @@ public boolean contains(String entityName, Object object) {
 				}
 			}
 
-			if ( object instanceof HibernateProxy ) {
+			final LazyInitializer li = HibernateProxy.extractLazyInitializer( object );
+			if ( li != null ) {
 				//do not use proxiesByKey, since not all
 				//proxies that point to this session's
 				//instances are in that collection!
-				LazyInitializer li = ( (HibernateProxy) object ).getHibernateLazyInitializer();
 				if ( li.isUninitialized() ) {
 					//if it is an uninitialized proxy, pointing
 					//with this session, then when it is accessed,
@@ -1693,14 +1702,14 @@ public void initializeCollection(PersistentCollection<?> collection, boolean wri
 
 	@Override
 	public String bestGuessEntityName(Object object) {
-		if ( object instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
-			LazyInitializer initializer = ( (HibernateProxy) object ).getHibernateLazyInitializer();
+		if ( lazyInitializer != null ) {
 			// it is possible for this method to be called during flush processing,
 			// so make certain that we do not accidentally initialize an uninitialized proxy
-			if ( initializer.isUninitialized() ) {
+			if ( lazyInitializer.isUninitialized() ) {
-				return initializer.getEntityName();
+				return lazyInitializer.getEntityName();
 			}
-			object = initializer.getImplementation();
+			object = lazyInitializer.getImplementation();
 		}
 		EntityEntry entry = persistenceContext.getEntry( object );
 		if ( entry == null ) {
@@ -1715,11 +1724,12 @@ public String bestGuessEntityName(Object object) {
 	public String getEntityName(Object object) {
 		checkOpen();
 //		checkTransactionSynchStatus();
-		if ( object instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
+		if ( lazyInitializer != null ) {
 			if ( !persistenceContext.containsProxy( object ) ) {
 				throw new TransientObjectException( "proxy was not associated with the session" );
 			}
-			object = ( (HibernateProxy) object ).getHibernateLazyInitializer().getImplementation();
+			object = lazyInitializer.getImplementation();
 		}
 
 		EntityEntry entry = persistenceContext.getEntry( object );
@@ -1732,9 +1742,9 @@ public String getEntityName(Object object) {
 	@Override @SuppressWarnings("unchecked")
 	public <T> T getReference(T object) {
 		checkOpen();
-		if ( object instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
-			LazyInitializer initializer = ( (HibernateProxy) object ).getHibernateLazyInitializer();
+		if ( lazyInitializer != null ) {
-			return (T) getReference( initializer.getPersistentClass(), initializer.getIdentifier() );
+			return (T) getReference( lazyInitializer.getPersistentClass(), lazyInitializer.getIdentifier() );
 		}
 		else {
 			EntityPersister persister = getEntityPersister( null, object );

hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java

@@ -328,7 +328,7 @@ public Object internalLoad(
 						if ( LOG.isTraceEnabled() ) {
 							LOG.trace( "Entity proxy found in session cache" );
 						}
-						if ( LOG.isDebugEnabled() && ( (HibernateProxy) proxy ).getHibernateLazyInitializer().isUnwrap() ) {
+						if ( LOG.isDebugEnabled() && HibernateProxy.extractLazyInitializer( proxy ).isUnwrap() ) {
 							LOG.debug( "Ignoring NO_PROXY to honor laziness" );
 						}
 
@@ -387,8 +387,7 @@ public void fetch(Object association) {
 		checkOpen();
 		PersistenceContext persistenceContext = getPersistenceContext();
 		if ( association instanceof HibernateProxy ) {
-			LazyInitializer initializer =
+			final LazyInitializer initializer = HibernateProxy.extractLazyInitializer( association );
-					((HibernateProxy) association).getHibernateLazyInitializer();
 			if ( initializer.isUninitialized() ) {
 				String entityName = initializer.getEntityName();
 				Object id = initializer.getIdentifier();
@@ -479,8 +478,9 @@ private void managedFlush() {
 
 	@Override
 	public String bestGuessEntityName(Object object) {
-		if ( object instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
-			object = ( (HibernateProxy) object ).getHibernateLazyInitializer().getImplementation();
+		if ( lazyInitializer != null ) {
+			object = lazyInitializer.getImplementation();
 		}
 		return guessEntityName( object );
 	}

hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java

@@ -17,6 +17,7 @@
 import org.hibernate.jpa.internal.util.PersistenceUtilHelper;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
 
 import org.jboss.logging.Logger;
 
@@ -69,8 +70,9 @@ public Object getIdentifier(Object entity) {
 			throw new IllegalArgumentException( "Passed entity cannot be null" );
 		}
 
-		if ( entity instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
-			return ((HibernateProxy) entity).getHibernateLazyInitializer().getInternalIdentifier();
+		if ( lazyInitializer != null ) {
+			return lazyInitializer.getInternalIdentifier();
 		}
 		else if ( isManagedEntity( entity ) ) {
 			EntityEntry entityEntry = asManagedEntity( entity ).$$_hibernate_getEntityEntry();

hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java

@@ -80,8 +80,9 @@ private PersistenceUtilHelper() {
 	 * @return The appropriate LoadState (see above)
 	 */
 	public static LoadState isLoaded(Object reference) {
-		if ( reference instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( reference );
-			final boolean isInitialized = !( (HibernateProxy) reference ).getHibernateLazyInitializer().isUninitialized();
+		if ( lazyInitializer != null ) {
+			final boolean isInitialized = !lazyInitializer.isUninitialized();
 			return isInitialized ? LoadState.LOADED : LoadState.NOT_LOADED;
 		}
 		else if ( isPersistentAttributeInterceptable( reference ) ) {
@@ -118,15 +119,15 @@ private static BytecodeLazyAttributeInterceptor extractInterceptor(PersistentAtt
 	 */
 	public static LoadState isLoadedWithoutReference(Object entity, String attributeName, MetadataCache cache) {
 		boolean sureFromUs = false;
-		if ( entity instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
-			LazyInitializer li = ( (HibernateProxy) entity ).getHibernateLazyInitializer();
+		if ( lazyInitializer != null ) {
-			if ( li.isUninitialized() ) {
+			if ( lazyInitializer.isUninitialized() ) {
 				// we have an uninitialized proxy, the attribute cannot be loaded
 				return LoadState.NOT_LOADED;
 			}
 			else {
 				// swap the proxy with target (for proper class name resolution)
-				entity = li.getImplementation();
+				entity = lazyInitializer.getImplementation();
 			}
 			sureFromUs = true;
 		}
@@ -200,15 +201,15 @@ else if ( sureFromUs ) {
 	 * @return The LoadState
 	 */
 	public static LoadState isLoadedWithReference(Object entity, String attributeName, MetadataCache cache) {
-		if ( entity instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
-			final LazyInitializer li = ( (HibernateProxy) entity ).getHibernateLazyInitializer();
+		if ( lazyInitializer != null ) {
-			if ( li.isUninitialized() ) {
+			if ( lazyInitializer.isUninitialized() ) {
 				// we have an uninitialized proxy, the attribute cannot be loaded
 				return LoadState.NOT_LOADED;
 			}
 			else {
 				// swap the proxy with target (for proper class name resolution)
-				entity = li.getImplementation();
+				entity = lazyInitializer.getImplementation();
 			}
 		}
 

hibernate-core/src/main/java/org/hibernate/loader/access/BaseNaturalIdLoadAccessImpl.java

@@ -200,8 +200,8 @@ protected final T doLoad(Object normalizedNaturalIdValue) {
 
 			if ( loaded != null ) {
 				final EntityEntry entry;
-				if ( loaded instanceof HibernateProxy ) {
+				final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( loaded );
-					LazyInitializer lazyInitializer = ( (HibernateProxy) loaded ).getHibernateLazyInitializer();
+				if ( lazyInitializer != null ) {
 					entry = persistenceContext.getEntry( lazyInitializer.getImplementation() );
 				}
 				else {

hibernate-core/src/main/java/org/hibernate/loader/access/IdentifierLoadAccessImpl.java

@@ -31,6 +31,9 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.TypeConfiguration;
 
+import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
+
 /**
  * @author Steve Ebersole
  */
@@ -210,8 +213,8 @@ private void initializeIfNecessary(Object result) {
 			return;
 		}
 
-		if ( result instanceof HibernateProxy ) {
+		if ( isHibernateProxy( result ) ) {
-			final HibernateProxy hibernateProxy = (HibernateProxy) result;
+			final HibernateProxy hibernateProxy = asHibernateProxy( result );
 			final LazyInitializer initializer = hibernateProxy.getHibernateLazyInitializer();
 			if ( initializer.isUninitialized() ) {
 				initializer.initialize();

hibernate-core/src/main/java/org/hibernate/loader/entity/CacheEntityLoaderHelper.java

@@ -431,7 +431,7 @@ private Object convertCacheEntryToEntity(
 		if ( proxy != null ) {
 			// there is already a proxy for this impl
 			// only set the status to read-only if the proxy is read-only
-			isReadOnly = ( (HibernateProxy) proxy ).getHibernateLazyInitializer().isReadOnly();
+			isReadOnly = HibernateProxy.extractLazyInitializer( proxy ).isReadOnly();
 		}
 		else {
 			isReadOnly = source.isDefaultReadOnly();

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java

@@ -28,6 +28,7 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
@@ -144,16 +145,18 @@ public IdentifierValue getUnsavedStrategy() {
 
 	@Override
 	public Object getIdentifier(Object entity, SharedSessionContractImplementor session) {
-		if ( entity instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
-			return ( (HibernateProxy) entity ).getHibernateLazyInitializer().getIdentifier();
+		if ( lazyInitializer != null ) {
+			return lazyInitializer.getIdentifier();
 		}
 		return propertyAccess.getGetter().get( entity );
 	}
 
 	@Override
 	public Object getIdentifier(Object entity) {
-		if ( entity instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
-			return ( (HibernateProxy) entity ).getHibernateLazyInitializer().getIdentifier();
+		if ( lazyInitializer != null ) {
+			return lazyInitializer.getIdentifier();
 		}
 		return propertyAccess.getGetter().get( entity );
 	}

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java

@@ -15,6 +15,7 @@
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.spi.SqlSelection;
@@ -85,16 +86,18 @@ public void applySqlSelections(
 
 	@Override
 	public Object getIdentifier(Object entity, SharedSessionContractImplementor session) {
-		if ( entity instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
-			return ( (HibernateProxy) entity ).getHibernateLazyInitializer().getIdentifier();
+		if ( lazyInitializer != null ) {
+			return lazyInitializer.getIdentifier();
 		}
 		return propertyAccess.getGetter().get( entity );
 	}
 
 	@Override
 	public Object getIdentifier(Object entity) {
-		if ( entity instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
-			return ( (HibernateProxy) entity ).getHibernateLazyInitializer().getIdentifier();
+		if ( lazyInitializer != null ) {
+			return lazyInitializer.getIdentifier();
 		}
 		return propertyAccess.getGetter().get( entity );
 	}

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java

@@ -31,6 +31,7 @@
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.Clause;
@@ -429,8 +430,11 @@ public Object getAssociationKeyFromSide(
 		if ( targetObject == null ) {
 			return null;
 		}
-		if ( refersToPrimaryKey && targetObject instanceof HibernateProxy ) {
+		if ( refersToPrimaryKey ) {
-			return ( (HibernateProxy) targetObject ).getHibernateLazyInitializer().getIdentifier();
+			final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( targetObject );
+			if ( lazyInitializer != null ) {
+				return lazyInitializer.getIdentifier();
+			}
 		}
 		final ModelPart modelPart = side.getModelPart();
 		if ( modelPart instanceof EntityIdentifierMapping ) {

hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java

@@ -15,6 +15,7 @@
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.property.access.internal.AbstractFieldSerialForm;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
 
 /**
  * Field-based implementation of Setter
@@ -68,8 +69,9 @@ public void set(Object target, Object value) {
 			}
 			else {
 				final String valueType;
-				if ( value instanceof HibernateProxy ) {
+				final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( value );
-					valueType = ( (HibernateProxy) value ).getHibernateLazyInitializer().getEntityName();
+				if ( lazyInitializer != null ) {
+					valueType = lazyInitializer.getEntityName();
 				}
 				else {
 					valueType = value.getClass().getTypeName();

hibernate-core/src/main/java/org/hibernate/proxy/HibernateProxy.java

@@ -7,12 +7,33 @@
 package org.hibernate.proxy;
 import java.io.Serializable;
 
+import org.hibernate.engine.spi.PrimeAmongSecondarySupertypes;
+
 /**
  * Marker interface for entity proxies
  *
  * @author Gavin King
  */
-public interface HibernateProxy extends Serializable {
+public interface HibernateProxy extends Serializable, PrimeAmongSecondarySupertypes {
+
+	/**
+	 * Extract the LazyInitializer from the object, if
+	 * and only if the object is actually an HibernateProxy.
+	 * If not, null is returned.
+	 * @param object any entity
+	 * @return either null (if object is not an HibernateProxy) or the LazyInitializer of the HibernateProxy.
+	 */
+	static LazyInitializer extractLazyInitializer(final Object object) {
+		if ( object instanceof PrimeAmongSecondarySupertypes ) {
+			PrimeAmongSecondarySupertypes t = (PrimeAmongSecondarySupertypes) object;
+			final HibernateProxy hibernateProxy = t.asHibernateProxy();
+			if ( hibernateProxy != null ) {
+				return hibernateProxy.getHibernateLazyInitializer();
+			}
+		}
+		return null;
+	}
+
 	/**
 	 * Perform serialization-time write-replacement of this proxy.
 	 *
@@ -26,4 +47,14 @@ public interface HibernateProxy extends Serializable {
 	 * @return The lazy initializer.
 	 */
 	LazyInitializer getHibernateLazyInitializer();
+
+	/**
+	 * Special internal contract to optimize type checking
+	 * @see PrimeAmongSecondarySupertypes
+	 * @return this same instance
+	 */
+	@Override
+	default HibernateProxy asHibernateProxy() {
+		return this;
+	}
 }

hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyProxyFactory.java

@@ -13,6 +13,7 @@
 import java.util.Set;
 
 import org.hibernate.HibernateException;
+import org.hibernate.engine.spi.PrimeAmongSecondarySupertypes;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.ReflectHelper;
@@ -105,7 +106,12 @@ private HibernateProxy getHibernateProxy()
 			public HibernateProxy run() {
 
 				try {
-					return (HibernateProxy) proxyClass.getConstructor().newInstance();
+					PrimeAmongSecondarySupertypes instance = (PrimeAmongSecondarySupertypes) proxyClass.getConstructor().newInstance();
+					final HibernateProxy hibernateProxy = instance.asHibernateProxy();
+					if ( hibernateProxy == null ) {
+						throw new HibernateException( "Produced proxy does not correctly implement HibernateProxy" );
+					}
+					return hibernateProxy;
 				}
 				catch (NoSuchMethodException e) {
 					String logMessage = LOG.bytecodeEnhancementFailedBecauseOfDefaultConstructor( entityName );

hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyProxyHelper.java

@@ -6,6 +6,10 @@
  */
 package org.hibernate.proxy.pojo.bytebuddy;
 
+import static net.bytebuddy.matcher.ElementMatchers.anyOf;
+import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy;
+import static net.bytebuddy.matcher.ElementMatchers.named;
+import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
 import static org.hibernate.internal.CoreLogging.messageLogger;
 
 import java.io.Serializable;
@@ -19,6 +23,15 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.bytecode.internal.bytebuddy.ByteBuddyState;
+import org.hibernate.engine.spi.CompositeOwner;
+import org.hibernate.engine.spi.CompositeTracker;
+import org.hibernate.engine.spi.Managed;
+import org.hibernate.engine.spi.ManagedComposite;
+import org.hibernate.engine.spi.ManagedEntity;
+import org.hibernate.engine.spi.ManagedMappedSuperclass;
+import org.hibernate.engine.spi.PersistentAttributeInterceptable;
+import org.hibernate.engine.spi.PrimeAmongSecondarySupertypes;
+import org.hibernate.engine.spi.SelfDirtinessTracker;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.proxy.HibernateProxy;
@@ -33,6 +46,7 @@
 import net.bytebuddy.description.type.TypeList;
 import net.bytebuddy.dynamic.DynamicType;
 import net.bytebuddy.dynamic.scaffold.subclass.ConstructorStrategy;
+import net.bytebuddy.implementation.DefaultMethodCall;
 import net.bytebuddy.implementation.SuperMethodCall;
 import net.bytebuddy.pool.TypePool;
 
@@ -92,7 +106,25 @@ private Function<ByteBuddy, DynamicType.Builder<?>> proxyBuilder(TypeDefinition
 						.intercept( SuperMethodCall.INSTANCE )
 				.defineField( ProxyConfiguration.INTERCEPTOR_FIELD_NAME, ProxyConfiguration.Interceptor.class, Visibility.PRIVATE )
 				.implement( ProxyConfiguration.class )
-						.intercept( helpers.getInterceptorFieldAccessor() );
+						.intercept( helpers.getInterceptorFieldAccessor() )
+				.ignoreAlso( isDeclaredBy( ManagedEntity.class ).and( named( "asManagedEntity" ) ) )
+				.ignoreAlso( isDeclaredBy( PrimeAmongSecondarySupertypes.class ).and( named( "asManagedEntity" ) ) )
+				.ignoreAlso( isDeclaredBy( PersistentAttributeInterceptable.class ).and( named( "asPersistentAttributeInterceptable" ) ) )
+				.ignoreAlso( isDeclaredBy( PrimeAmongSecondarySupertypes.class ).and( named( "asPersistentAttributeInterceptable" ) ) )
+				.ignoreAlso( isDeclaredBy( SelfDirtinessTracker.class ).and( named( "asSelfDirtinessTracker" ) ) )
+				.ignoreAlso( isDeclaredBy( PrimeAmongSecondarySupertypes.class ).and( named( "asSelfDirtinessTracker" ) ) )
+				.ignoreAlso( isDeclaredBy( Managed.class ).and( named( "asManaged" ) ) )
+				.ignoreAlso( isDeclaredBy( PrimeAmongSecondarySupertypes.class ).and( named( "asManaged" ) ) )
+				.ignoreAlso( isDeclaredBy( ManagedComposite.class ).and( named( "asManagedComposite" ) ) )
+				.ignoreAlso( isDeclaredBy( PrimeAmongSecondarySupertypes.class ).and( named( "asManagedComposite" ) ) )
+				.ignoreAlso( isDeclaredBy( ManagedMappedSuperclass.class ).and( named( "asManagedMappedSuperclass" ) ) )
+				.ignoreAlso( isDeclaredBy( PrimeAmongSecondarySupertypes.class ).and( named( "asManagedMappedSuperclass" ) ) )
+				.ignoreAlso( isDeclaredBy( CompositeOwner.class ).and( named( "asCompositeOwner" ) ) )
+				.ignoreAlso( isDeclaredBy( PrimeAmongSecondarySupertypes.class ).and( named( "asCompositeOwner" ) ) )
+				.ignoreAlso( isDeclaredBy( CompositeTracker.class ).and( named( "asCompositeTracker" ) ) )
+				.ignoreAlso( isDeclaredBy( PrimeAmongSecondarySupertypes.class ).and( named( "asCompositeTracker" ) ) )
+				.ignoreAlso( isDeclaredBy( HibernateProxy.class ).and( named( "asHibernateProxy" ) ) )
+				.ignoreAlso( isDeclaredBy( PrimeAmongSecondarySupertypes.class ).and( named( "asHibernateProxy" ) ) );
 	}
 
 	public HibernateProxy deserializeProxy(SerializableProxy serializableProxy) {
@@ -114,7 +146,7 @@ public HibernateProxy deserializeProxy(SerializableProxy serializableProxy) {
 					serializableProxy.getPersistentClass(),
 					serializableProxy.getInterfaces()
 			);
-			final HibernateProxy proxy = (HibernateProxy) proxyClass.newInstance();
+			final HibernateProxy proxy = asHibernateProxy( proxyClass.newInstance() );
 			( (ProxyConfiguration) proxy ).$$_hibernate_set_interceptor( interceptor );
 			return proxy;
 		}

hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AbstractEmbeddableInitializer.java

@@ -24,6 +24,7 @@
 import org.hibernate.metamodel.spi.ValueAccess;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.results.graph.AbstractFetchParentAccess;
 import org.hibernate.sql.results.graph.AssemblerCreationState;
@@ -196,7 +197,8 @@ public void initializeInstance(RowProcessingState processingState) {
 		if ( compositeInstance != NULL_MARKER ) {
 			notifyResolutionListeners( compositeInstance );
 
-			if ( compositeInstance instanceof HibernateProxy ) {
+			final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( compositeInstance );
+			if ( lazyInitializer != null ) {
 				final Initializer parentInitializer = processingState.resolveInitializer( navigablePath.getParent() );
 				if ( parentInitializer != this ) {
 					( (FetchParentAccess) parentInitializer ).registerResolutionListener( (entity) -> {
@@ -215,7 +217,7 @@ public void initializeInstance(RowProcessingState processingState) {
 							.getInstantiator()
 							.instantiate( this, sessionFactory);
 					stateInjected = true;
-					( (HibernateProxy) compositeInstance ).getHibernateLazyInitializer().setImplementation( target );
+					lazyInitializer.setImplementation( target );
 				}
 			}
 			else if ( stateAllNull == FALSE && stateInjected != TRUE ) {

hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityInitializer.java

@@ -648,9 +648,8 @@ public void initializeInstance(RowProcessingState rowProcessingState) {
 
 		final SharedSessionContractImplementor session = rowProcessingState.getJdbcValuesSourceProcessingState().getSession();
 		final PersistenceContext persistenceContext = session.getPersistenceContext();
-		if ( entityInstance instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entityInstance );
-			LazyInitializer hibernateLazyInitializer = ( (HibernateProxy) entityInstance ).getHibernateLazyInitializer();
+		if ( lazyInitializer != null ) {
-
 			Object instance = persistenceContext.getEntity( entityKey );
 			if ( instance == null ) {
 				instance = resolveInstance(
@@ -662,7 +661,7 @@ public void initializeInstance(RowProcessingState rowProcessingState) {
 				initializeEntity( instance, rowProcessingState, session, persistenceContext );
 			}
 
-			hibernateLazyInitializer.setImplementation( instance );
+			lazyInitializer.setImplementation( instance );
 			entityInstanceForNotify = instance;
 		}
 		else {
@@ -865,10 +864,11 @@ private void initializeEntity(
 			isReallyReadOnly = true;
 		}
 		else {
-			if ( entityInstance instanceof HibernateProxy) {
+			final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entityInstance );
+			if ( lazyInitializer != null ) {
 				// there is already a proxy for this impl
 				// only set the status to read-only if the proxy is read-only
-				isReallyReadOnly = 	( (HibernateProxy) entityInstance ).getHibernateLazyInitializer().isReadOnly();
+				isReallyReadOnly = 	lazyInitializer.isReadOnly();
 			}
 		}
 		if ( isReallyReadOnly ) {

hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java

@@ -19,6 +19,7 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.UniqueKeyLoadable;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.results.graph.AbstractFetchParentAccess;
 import org.hibernate.sql.results.graph.DomainResultAssembler;
@@ -168,9 +169,9 @@ && isEnhancedForLazyLoading( parentAccess ) ) {
 						);
 					}
 
-					if ( entityInstance instanceof HibernateProxy ) {
+					final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entityInstance );
-						( (HibernateProxy) entityInstance ).getHibernateLazyInitializer()
+					if ( lazyInitializer != null ) {
-								.setUnwrap( referencedModelPart.isUnwrapProxy() && concreteDescriptor.isInstrumented() );
+						lazyInitializer.setUnwrap( referencedModelPart.isUnwrapProxy() && concreteDescriptor.isInstrumented() );
 					}
 				}
 			}

hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntitySelectFetchInitializer.java

@@ -20,6 +20,7 @@
 import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.spi.EntityIdentifierNavigablePath;
 import org.hibernate.sql.results.graph.AbstractFetchParentAccess;
@@ -216,8 +217,9 @@ public void initializeInstance(RowProcessingState rowProcessingState) {
 		}
 
 		final boolean unwrapProxy = toOneMapping.isUnwrapProxy() && isEnhancedForLazyLoading;
-		if ( entityInstance instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entityInstance );
-			( (HibernateProxy) entityInstance ).getHibernateLazyInitializer().setUnwrap( unwrapProxy );
+		if ( lazyInitializer != null ) {
+			lazyInitializer.setUnwrap( unwrapProxy );
 		}
 		isInitialized = true;
 	}

hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/CircularBiDirectionalFetchImpl.java

@@ -28,6 +28,7 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.UniqueKeyLoadable;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.spi.SqlSelection;
@@ -275,12 +276,13 @@ public Object assemble(RowProcessingState rowProcessingState, JdbcValuesSourcePr
 				initializer.resolveInstance( rowProcessingState );
 			}
 			final Object initializedInstance = initializer.getInitializedInstance();
-			if ( initializedInstance instanceof HibernateProxy ) {
+			final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( initializedInstance );
+			if ( lazyInitializer != null ) {
 				if ( initializedInstance.getClass().isAssignableFrom( javaType.getJavaTypeClass() ) ) {
 					return initializedInstance;
 				}
 				initializer.initializeInstance( rowProcessingState );
-				return ( (HibernateProxy) initializedInstance ).getHibernateLazyInitializer().getImplementation();
+				return lazyInitializer.getImplementation();
 			}
 			return initializedInstance;
 		}

hibernate-core/src/main/java/org/hibernate/type/AnyType.java

@@ -155,12 +155,12 @@ private EntityPersister guessEntityPersister(Object object) {
 
 		// this code is largely copied from Session's bestGuessEntityName
 		Object entity = object;
-		if ( entity instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
-			final LazyInitializer initializer = ( (HibernateProxy) entity ).getHibernateLazyInitializer();
+		if ( lazyInitializer != null ) {
-			if ( initializer.isUninitialized() ) {
+			if ( lazyInitializer.isUninitialized() ) {
-				entityName = initializer.getEntityName();
+				entityName = lazyInitializer.getEntityName();
 			}
-			entity = initializer.getImplementation();
+			entity = lazyInitializer.getImplementation();
 		}
 
 		if ( entityName == null ) {

hibernate-core/src/main/java/org/hibernate/type/CollectionType.java

@@ -91,8 +91,8 @@ public boolean contains(Object collection, Object childObject, SharedSessionCont
 		while ( elems.hasNext() ) {
 			Object element = elems.next();
 			// worrying about proxies is perhaps a little bit of overkill here...
-			if ( element instanceof HibernateProxy ) {
+			final LazyInitializer li = HibernateProxy.extractLazyInitializer( element );
-				LazyInitializer li = ( (HibernateProxy) element ).getHibernateLazyInitializer();
+			if ( li != null ) {
 				if ( !li.isUninitialized() ) {
 					element = li.getImplementation();
 				}

hibernate-core/src/main/java/org/hibernate/type/EntityType.java

@@ -24,8 +24,12 @@
 import org.hibernate.persister.entity.Joinable;
 import org.hibernate.persister.entity.UniqueKeyLoadable;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.type.spi.TypeConfiguration;
 
+import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
+
 /**
  * Base for types which map associations to persistent entities.
  *
@@ -320,8 +324,9 @@ public int getHashCode(Object x, SessionFactoryImplementor factory) {
 		}
 
 		final Object id;
-		if ( x instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( x );
-			id = ( (HibernateProxy) x ).getHibernateLazyInitializer().getInternalIdentifier();
+		if ( lazyInitializer != null ) {
+			id = lazyInitializer.getInternalIdentifier();
 		}
 		else {
 			final Class<?> mappedClass = persister.getMappedClass();
@@ -349,9 +354,9 @@ public boolean isEqual(Object x, Object y, SessionFactoryImplementor factory) {
 
 		final Class<?> mappedClass = persister.getMappedClass();
 		Object xid;
-		if ( x instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializerX = HibernateProxy.extractLazyInitializer( x );
-			xid = ( (HibernateProxy) x ).getHibernateLazyInitializer()
+		if ( lazyInitializerX != null ) {
-					.getInternalIdentifier();
+			xid = lazyInitializerX.getInternalIdentifier();
 		}
 		else {
 			if ( mappedClass.isAssignableFrom( x.getClass() ) ) {
@@ -364,9 +369,9 @@ public boolean isEqual(Object x, Object y, SessionFactoryImplementor factory) {
 		}
 
 		Object yid;
-		if ( y instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializerY = HibernateProxy.extractLazyInitializer( y );
-			yid = ( (HibernateProxy) y ).getHibernateLazyInitializer()
+		if ( lazyInitializerY != null ) {
-					.getInternalIdentifier();
+			yid = lazyInitializerY.getInternalIdentifier();
 		}
 		else {
 			if ( mappedClass.isAssignableFrom( y.getClass() ) ) {
@@ -505,8 +510,8 @@ public String toLoggableString(Object value, SessionFactoryImplementor factory)
 
 		if ( persister.hasIdentifierProperty() ) {
 			final Object id;
-			if ( value instanceof HibernateProxy ) {
+			if ( isHibernateProxy( value ) ) {
-				HibernateProxy proxy = (HibernateProxy) value;
+				HibernateProxy proxy = asHibernateProxy( value );
 				id = proxy.getHibernateLazyInitializer().getInternalIdentifier();
 			}
 			else {
@@ -652,9 +657,9 @@ protected final Object resolveIdentifier(Object id, SharedSessionContractImpleme
 				isNullable()
 		);
 
-		if ( proxyOrEntity instanceof HibernateProxy ) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( proxyOrEntity );
-			( (HibernateProxy) proxyOrEntity ).getHibernateLazyInitializer()
+		if ( lazyInitializer != null ) {
-					.setUnwrap( isProxyUnwrapEnabled );
+			lazyInitializer.setUnwrap( isProxyUnwrapEnabled );
 		}
 
 		return proxyOrEntity;

hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java

@@ -0,0 +1,117 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.bytecode.internal.bytebuddy;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.hibernate.LazyInitializationException;
+import org.hibernate.engine.spi.PrimeAmongSecondarySupertypes;
+import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.ProxyFactory;
+import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyFactory;
+import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyHelper;
+
+import org.hibernate.testing.TestForIssue;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Verifies that proxies being generated by ByteBuddyProxyHelper
+ * do not break the contract with PrimeAmongSecondarySupertypes.
+ * A problem in this are could obviously manifest as a semantic
+ * issue, but could also manifest solely as a performance issue;
+ * therefore we check implementation details via unit tests
+ * rather than the typical integration test we'd have in such cases.
+ *
+ * @author Sanne Grinovero
+ */
+@TestForIssue( jiraKey = "HHH-15790" )
+public class SuperTypesEnhancementTest {
+
+	private static final ByteBuddyProxyHelper helper = new ByteBuddyProxyHelper( new ByteBuddyState() );
+
+	private static Stream<Arguments> superTypeMethods() {
+		return Arrays.stream( PrimeAmongSecondarySupertypes.class.getDeclaredMethods() ).map( e -> Arguments.of( e ) );
+	}
+
+	private static Stream<Arguments> interfaces() {
+		return Arrays.stream( PrimeAmongSecondarySupertypes.class.getDeclaredMethods() ).map( m -> m.getReturnType() ).map( e -> Arguments.of( e ) );
+	}
+
+	@ParameterizedTest
+	@MethodSource("superTypeMethods")
+	public void testNamingConventions(Method m) {
+		final Class<?> returnType = m.getReturnType();
+		final String expectedMethodName = "as" + returnType.getSimpleName();
+		Assert.assertEquals( expectedMethodName, m.getName() );
+		Assert.assertNotNull( m.isDefault() );
+	}
+
+	@ParameterizedTest
+	@MethodSource("superTypeMethods")
+	public void testSubInterfaceOverrides(Method m) throws NoSuchMethodException {
+		final Class<?> returnType = m.getReturnType();
+		final Method subMethod = returnType.getMethod( m.getName(), m.getParameterTypes() );
+		Assert.assertNotNull( subMethod );
+		Assert.assertNotNull( subMethod.isDefault() );
+	}
+
+	@ParameterizedTest
+	@MethodSource("interfaces")
+	public void testAllProxyGeneration(Class<?> secondarySuper) {
+		ProxyFactory enhancer = createProxyFactory( SampleClass.class, secondarySuper );
+		final Object proxy = enhancer.getProxy( Integer.valueOf( 1 ), null );
+		Assert.assertTrue( secondarySuper.isAssignableFrom( proxy.getClass() ) );
+		PrimeAmongSecondarySupertypes casted = (PrimeAmongSecondarySupertypes) proxy;
+		testForLIE( (SampleClass) proxy );
+	}
+
+	@Test
+	public void testGeneratedHibernateProxy() {
+		ProxyFactory enhancer = createProxyFactory( SampleClass.class, HibernateProxy.class );
+		final Object proxy = enhancer.getProxy( Integer.valueOf( 1 ), null );
+		Assert.assertTrue( HibernateProxy.class.isAssignableFrom( proxy.getClass() ) );
+		Assert.assertTrue( proxy instanceof HibernateProxy );
+		PrimeAmongSecondarySupertypes casted = (PrimeAmongSecondarySupertypes) proxy;
+		final HibernateProxy extracted = casted.asHibernateProxy();
+		Assert.assertNotNull( extracted );
+		Assert.assertSame( proxy, extracted );
+		testForLIE( (SampleClass) proxy );
+	}
+
+	/**
+	 * Self-check: verify that this is in fact a lazy proxy
+	 */
+	private void testForLIE(SampleClass sampleProxy) {
+		SampleClass other = new SampleClass();
+		Assert.assertEquals( 7, other.additionMethod( 3,4 ) );
+		Assert.assertThrows( LazyInitializationException.class, () -> sampleProxy.additionMethod( 3, 4 ) );
+	}
+
+	private ProxyFactory createProxyFactory(Class<?> persistentClass, Class<?>... interfaces) {
+		ByteBuddyProxyFactory proxyFactory = new ByteBuddyProxyFactory( helper );
+		proxyFactory.postInstantiate( "", persistentClass, Set.of( interfaces ), null, null, null );
+		return proxyFactory;
+	}
+
+	//Just a class with some fields and methods to proxy
+	static class SampleClass {
+		int intField;
+		String stringField;
+
+		public int additionMethod(int a, int b) {
+			return a + b;
+		}
+	}
+
+}

hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversEventListener.java

@@ -20,6 +20,9 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.proxy.HibernateProxy;
 
+import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
+
 /**
  * Base class for all Envers event listeners
  *
@@ -92,8 +95,8 @@ private void addCollectionChangeWorkUnit(
 		String toEntityName;
 		Object id;
 
-		if ( value instanceof HibernateProxy ) {
+		if ( isHibernateProxy( value ) ) {
-			final HibernateProxy hibernateProxy = (HibernateProxy) value;
+			final HibernateProxy hibernateProxy = asHibernateProxy( value );
 			id = hibernateProxy.getHibernateLazyInitializer().getInternalIdentifier();
 			// We've got to initialize the object from the proxy to later read its state.
 			value = EntityTools.getTargetFromProxy( session.getFactory(), hibernateProxy );

hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java

@@ -19,6 +19,9 @@
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 
+import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
+
 /**
  * @author Adam Warski (adam at warski dot org)
  * @author Hernán Chanfreau
@@ -105,8 +108,8 @@ private void replaceNonAuditIdProxies(Map versionsEntity, Number revision) {
 		final Map originalId = (Map) versionsEntity.get( enversService.getConfig().getOriginalIdPropertyName() );
 		for ( Object key : originalId.keySet() ) {
 			final Object value = originalId.get( key );
-			if ( value instanceof HibernateProxy ) {
+			if ( isHibernateProxy( value ) ) {
-				final HibernateProxy hibernateProxy = (HibernateProxy) value;
+				final HibernateProxy hibernateProxy = asHibernateProxy( value );
 				final LazyInitializer initializer = hibernateProxy.getHibernateLazyInitializer();
 				final String entityName = initializer.getEntityName();
 				final Object entityId = initializer.getInternalIdentifier();

hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SingleIdMapper.java

@@ -15,6 +15,9 @@
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.service.ServiceRegistry;
 
+import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
+
 /**
  * An implementation of an identifier mapper for a single basic attribute property.
  *
@@ -77,8 +80,8 @@ public Object mapToIdFromEntity(final Object data) {
 			return null;
 		}
 
-		if ( data instanceof HibernateProxy ) {
+		if ( isHibernateProxy( data ) ) {
-			final HibernateProxy hibernateProxy = (HibernateProxy) data;
+			final HibernateProxy hibernateProxy = asHibernateProxy( data );
 			return hibernateProxy.getHibernateLazyInitializer().getInternalIdentifier();
 		}
 		else {
@@ -99,8 +102,8 @@ public void mapToMapFromEntity(Map<String, Object> data, final Object obj) {
 			data.put( propertyData.getName(), null );
 		}
 		else {
-			if ( obj instanceof HibernateProxy ) {
+			if ( isHibernateProxy( obj ) ) {
-				final HibernateProxy hibernateProxy = (HibernateProxy) obj;
+				final HibernateProxy hibernateProxy = asHibernateProxy( obj );
 				data.put( propertyData.getName(), hibernateProxy.getHibernateLazyInitializer().getInternalIdentifier() );
 			}
 			else {

hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/VirtualEntitySingleIdMapper.java

@@ -20,6 +20,9 @@
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.EntityType;
 
+import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
+
 /**
  * An extension to the {@link SingleIdMapper} implementation that supports the use case of an {@code @IdClass}
  * mapping that contains an entity association where the {@code @IdClass} stores the primary key of the
@@ -130,8 +133,8 @@ public void mapToMapFromEntity(Map<String, Object> data, Object obj) {
 			data.put( propertyData.getName(), null );
 		}
 		else {
-			if ( obj instanceof HibernateProxy ) {
+			if ( isHibernateProxy( obj ) ) {
-				final HibernateProxy proxy = (HibernateProxy) obj;
+				final HibernateProxy proxy = asHibernateProxy( obj );
 				data.put( propertyData.getName(), proxy.getHibernateLazyInitializer().getInternalIdentifier() );
 			}
 			else {

hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/EntityTools.java

@@ -15,6 +15,9 @@
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.proxy.HibernateProxy;
 
+import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
+
 /**
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  */
@@ -31,8 +34,8 @@ public static Object getIdentifier(SessionImplementor session, String entityName
 			return null;
 		}
 
-		if ( obj instanceof HibernateProxy ) {
+		if ( isHibernateProxy( obj ) ) {
-			final HibernateProxy hibernateProxy = (HibernateProxy) obj;
+			final HibernateProxy hibernateProxy = asHibernateProxy( obj );
 			return hibernateProxy.getHibernateLazyInitializer().getInternalIdentifier();
 		}
 

hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/unidirectional/RelationNotAuditedTarget.java

@@ -20,6 +20,9 @@
 import org.hibernate.proxy.LazyInitializer;
 import org.junit.Test;
 
+import static org.hibernate.engine.internal.ManagedTypeHelper.asHibernateProxy;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
+
 /**
  * @author Tomasz Bech
  */
@@ -114,10 +117,9 @@ public void testRevisionsCounts() {
 	}
 
 	static Class<?> getClassWithoutInitializingProxy(Object object) {
-		if (object instanceof HibernateProxy) {
+		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( object );
-			HibernateProxy proxy = (HibernateProxy) object;
+		if ( lazyInitializer != null ) {
-			LazyInitializer li = proxy.getHibernateLazyInitializer();
+			return lazyInitializer.getPersistentClass();
-			return li.getPersistentClass();
 		}
 		else {
 			return object.getClass();