WIP - make sure object is prefetched
This should clear up some db issues. Maybe not all of them hence the WIP label. Can someone test if this helps? Also failing tests. So maybe my SQL is wrong or maybe the tests have issues. I will dive in but I think this is on the right trail.