All tests for caching now work
Merge pull request #188 from cchan5/master

All tests for caching now work