Moved caching to a new Spring bean