Merge "Remove unused cache methods"