Fix the clear cache so it really clears all caches