Caching: changed version/value-key structure (as a preperation for decorator integration)