I created PR https://github.com/hibernate/hibernate-orm/pull/1524 which contains a minimal modified PersistentMapTest to reproduce the bug.