Revert "generic solution for caching data"

This reverts commit 184464a2a276991f7b57d11f56bf4d0cbb3d7c16.
meh