CFY-517 store provider name in provider context; allow use on servers with no context defined