Redesigning cache API (storage behaviour is the same)