@mrgriscom it seems it would be better to override CommCareCase.wrap like https://github.com/dimagi/casexml/commit/6f4fae8712cb863d0d075411064301241c6ffc4e#L0L316

When I did this everything seemed to be working but it broke some tests that I didn't have time to investigate.