Change the naming of the cache functions.
Want to be more specific so that these functions are not accidentally
used incorrectly.