Misc improvements around caching, indexing and search.