Cache search result to avoid dual search
Merge pull request #446 from Dmitry-Me/eliminateDualSearch

Cache search result to avoid dual search