put entity_id back in the extra_context (breaks existing data on redis)