Less code the no-cache bit

Other stuff seems a bit OTT