Impending change for developers: $TEST_DATA is going away, better default image caching