Fixes deadlocking issues when saving

- Contexts are no longer nested, this just doesn't avoid deadlocks. Now all contexts are connected directly to the persistent store controller.