Case 3372 - Added cache based on language.
Merge branch 'case-3373' into new-search

* case-3373:
  Case 3372 - Added cache based on language.