PRD-4251: Caching was broken after EHCache caching was no longer broken.