oops don't store as key:val
Merge branch 'set-cache'
3.3.3