Refactor dataCAche