zcache upstream 2