Revert "Remove moribund code."

This reverts commit 8e71006.

plone/app/vocabularies/catalog.py

@@ -25,6 +25,13 @@
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
 from zope.component.hooks import getSite
+
+try:
+    from zope.globalrequest import getRequest
+except ImportError:
+    def getRequest():
+        return None
+
 import itertools
 import os
 import six
@@ -659,6 +666,12 @@ def __call__(self, context, query=None):
         return CatalogVocabulary.fromItems(parsed, context)
 
 
+def request_query_cache_key(func, vocab):
+    return json.dumps([
+        vocab.query, vocab.text_search_index, vocab.title_template
+    ])
+
+
 @implementer(IQuerySource, IVocabularyFactory)
 class StaticCatalogVocabulary(CatalogVocabulary):
     """Catalog Vocabulary for static queries of content based on a fixed query.
@@ -804,6 +817,10 @@ def get_brain_path(self, brain):
             path = path[len(nav_root_path):]
         return path
 
+    @staticmethod
+    def get_request():
+        return getRequest()
+
     @property
     @view_memoize
     def brains(self):