Fixes for failing tests because of the new anti-caching stuff