Agreed. Will add that, and also simplify this a bit more. I think I can set just one variable in each block, and deduce the cache key and whether the cache needs to be bypassed or not from that one variable. Will update the commit later today.