Updated for puppet cache
Removed osx