Move instantiation of display_provider out to caller