Update CrossOriginWorkerMaker
to use cache
#778
Merged
CrossOriginWorkerMaker
to use cache
#778