Adds more tests for caching