Changes to caches to support new MemorySystem
Working on MemorySystem