Don't load grains/functions for the master job cache
Cleanup
Cleanup some of the API in there
Merge pull request #12290 from jacksontj/job_cache

Job cache