More cache work -- remove some code, get rid of old file.