Fix for failing cache clear