Revert "removed GenericDeferrer and DeferredCacher from util.deferral"