Anthony Vanelverdinghe The problem with the WeakReference solution is what Dyorgio hints at - namely when those references go away there is nothing in those Maps anymore for other SessionFactories on the same ClassLoader. This is why the change in 6.0 is really the more appropriate change. But regarding the WeakReference, I am not sure of the type of testing we would do anyway.