Fix for cache-clear