Issue #2164367 by alexpott, tim.plunkett, dawehner: Rebuild router as few times as possible per request.