Re-factor ServiceExec caches so they're cleared out with each new instance of ServiceController