Feature/zc5

Includes a couple of last-minute updates to help ease a transition from QC to ZC; i.e. to help better prepare Quick Cache to be updated from QC to ZC.

@raamdev Please leave this PR open for now. I don't consider this ready to merge just yet. We will probably find there are some other considerations that we should make; i.e. this is not the last of the changes.