Merge branch 'sp/doc-update-index-cacheinfo'