Changed EventSourceProvider to be stateless