Bit of renaming in cache module so far