DFCache tests refactoring