Rework the cache retry behavior when the index is cached