Fixes for failing tests due to caching.