Good catch. This shouldn't be static. It will fail if the server is embedded and the embedding app stops/discards a server and then starts a new one. Plus it could lead to a future bug if we ever change when in the lifecycle this persistence stuff gets locked down.