MDL-39062 cache: persist keys now set properly