Merge "Remove legacy cache clearing logic."