DFCache refactoring