SOLR-5783: fix mixing caching + non caching searchers, fix multiple registration of same searcher

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1577169 13f79535-47bb-0310-9956-ffa450edef68