We have migrated from 5.1.0.Final to Hibernate 5.2.9.Final

We are facing one issue with the sessionImpl.contains method
In our application, we works with entity name concepts.
Following is the hbm mapping
<class name="com.test.Employee" table="employee" entity-name="com_test_employee">

The issue with the Hibernate 5.2.9.Final is that when
SessionImpl.contains(Object object)is getting called there is one additional line of code
getSessionFactory().getMetamodel().entityPersister( object.getClass() );
(line number 2018 ) which was not there in 5.1.0 also gets invoked.
And for us always throws IllegalArgumentException saying
"Not an entity com.test.Employee"


Due to technical reasons we cannot change the entity name to "com.test.Employee".
We cannot always call the contains(String entityName, Object object) as
sometimes this contains method gets called from
1)sessionimpl.lock(Object entity, LockModeType lockModeType, Map<String, Object> properties)
2)DefaultRefreshEventListener.onRefresh
3)AuditProcess.getCurrentRevisionData

We also have configured Hibernate Envers and AuditProcess.getCurrentRevisionData internally calls session.contains(object) method.
Can anyone please suggest how this can be solved.

I added this test case to Hibernate core and everything works just fine. Send me a Pull Request with a modification that replicates your use case to see what's not working for you.