refs #6637 more work on simplifying the caching layer