Refactor to use a Map of CacheName.