Replacing deprecated MapMaker by new CacheBuilder