WIKI-922 consider tenant name when caching wiki information
Merge commit 'ed3ac253ac4914476cfd1af02f5cff7a14413eb1' into HEAD