Add changes to CacheMap as well