remove some caching for testing