cherry-pick/revert: transparently refresh index