WIKI-708: Fix wrong cache configuration
Merge commit '0a719884d7fb4a73f29b2b5d027e12cdb5bf05ec' into HEAD