Should we move this to the doStart() method so that we don't invoke it per-request?