HHH-10264 has the same fix, plus addresses some other issues around hibernate.cache.auto_evict_collection_cache handling. Plus it has tests