Fixed cache problems