Fixed tests for caching