DFCache 2.1: refactoring