cleaned up model mapping for updating cache so less work is done in every iteration