Updated caching paths. Refs #3