Fix CachingTest for 2.7.x