Cache: more efficient upgrading