I think this is a pretty common bug and it might be worthwhile to have it fixed without Hibernate 6. The fix turns out to be pretty easy and I created a PR for v5.3 here: https://github.com/hibernate/hibernate-orm/pull/3113