Merge "First pass at updated cache clearing logic."