Update: Allow for cache overrides