Fixed cache merge