refactoring; added file-info-caching domain