Changes to test_caching.py.