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