DDBNEXT-103: caching is broken
DDBNEXT-103: refactor