proper singularization of "caches"
closes #663