Changes to test_caching.py to work with DataSet.