Fixed cache copying