Better tests for caching