If there is really a leak we maybe could skip the caching all together? Or we could use the _ConcurrentReferenceHashMap_, but I think that class is part of the web module.