PLA-1139 Fixed code elegance, docs and reduced cache to 24h