Merge remaining cache changes