More work on caching test framework