Cache fixes

Fixes bugs, including fixes removed from NetworkAtomics (whoops). See individual commit messages.
What does "not needed - added" mean?  Seem like the both calls should just be deleted like the others.

Also, who was the sloppy reviewer that let this in in the first place?!?!???  Oh wait.  nm.