pulled cache stuff into one file, mostly
added test for ssh