Standardize the names of the cache variables.
Standardize cache names.