Improve naming convention for Context caching.