Safer way to remove mkey.
Merge branch 'store-cache' into iow-testing