tighten up preindex caching