Fixed cache update issues