fixup! finish rewriting consensus+diffs caching