Add changes to CacheMap to improve redis (i hope)