Add cacheMap for tests