Let fetch set/get cached data

This looks like the @todo was also fixed from PR #2399