Resolve the multi-request issue.
Inject and store config objects, not the config factory, for easier testing.
Minor cleanup.