Simplify DFCache implementation