[PPP-2392] - Readded cache-messages setting.
Merge pull request #192 from pamval/5.1

[PPP-2392] - Readded cache-messages setting.