Improve performance of search when the query is in the cache.
Speed up in the search cache by avoiding construction of the set of all book ids when the cache hits

Merge branch 'master' of https://github.com/cbhaley/calibre