Manually block up sections of output from caches into lists to avoid flooding the underlying transport
fix bug
Fix some issues
Fixes, need to be careful about maps when coming out of a cache
Fix bad merges
Fix some rebase issues