WIP: move cache data to single class