proper singularization of "caches"
closes #663
changelog for 8053eae18af500d03c8bbc7b379b6dab57069d0a
merge 8053eae18af500d03c8bbc7b379b6dab57069d0a to 4bed0ab270a7694a95b5f966dfb44b2eb2ac133c
merge forgotten bbde9c77e17f8e17a0c51ec5abbb4bd9ebd8eebf
fix 0e1995a8e12ddbb8f02462746175a4c658ca1ae9