Merge "Remove double cache eviction logic."