Fixed cache clearing