Further fixing of caching issue in test suite