Failed Policy Deployment Recovery

Is there a way to get ZCM to redeploy automatically a failed policy? I have struggled to get some of my clients to get a failed policy or to get the ZCC to show that the policy was deployed correctly. This kind of goes with my frustration with the ZAA failures I have. I can script a way to get a client to register if it is not but recently I have a lot of the clients that show a correct primary server but does not communicate with the server. I know some of this is due to a Cache issue that is being worked on. In reading Puppet information I am wondering if there is a similar way to handle this with ZCM so that an expected state forces auto-corrections on the end users device.

Thanks

Richard