zcache upstream 3