Need to address uses in org.hibernate.internal.CacheImpl and org.hibernate.stat.internal.ConcurrentStatisticsImpl