Added support for dashes in machine name, prevent cache clear error if cache not set.
Merge pull request #25 from fluxsauce/master

Added support for dashes in machine name, prevent cache clear error if cache not set.