wip: rework data caches