#762 - Provide a mechanism for caching calls to buildIncrementalIndex as well