Steve Ebersole, I believe that the conditions under which EntityType#resolveIdentifier sets {{HibernateProxy#setUnwrap( true )}} needs to be changed, but I’m not 100%.

I’ve pushed a test reproducing this issue upstream (marked FailureExpected):

https://github.com/hibernate/hibernate-orm/blob/master/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java