Added some more cache stuff
Moved the activity network code into the parent