Minor changes for Cache