Cache tweak

An initial stab at tweaking the caching section.