This is a first step towards removing all state from the api crate and keeping everything in the app crate.