Replacing home-made cache with a proper Guava cache.