CFY-443 now saving provider context again after teardown