- Fleshing out more of the caching framework.