Cleaned DataRepository
Rewritten cache part