Misc improvements around caching, indexing and search.
Merge pull request #2 from niravthaker/master

Misc improvements around caching, indexing and search.