* reverted last CacheCollection changes in consideration of single responsibility principles.