Feature/new caching format