removed remaining unsafe caches