My suggestion seems to break at least one test in hibernate-core :

{code}

Task :hibernate-core:test

NaturalIdTest > testNaturalIdLoaderCached FAILED
java.lang.AssertionError at NaturalIdTest.java:224

11764 tests completed, 1 failed, 1515 skipped

Task :hibernate-core:test FAILED

FAILURE: Build failed with an exception.

{code}

I’ll try to have a look soon.