Cache fixes

Fixes bugs, including fixes removed from NetworkAtomics (whoops). See individual commit messages.