Adding in a cache and storage object so I can save things for later