Fixed cache bug