Remove some of the calls to .cache()