Cache update

Please double test this. I may have missed something. I did put in a couple DR. Who references for fun.