Bugfixes from cache-breaker