Updating Caching and Options to match original project
Merge branch 'master' of https://github.com/drpain/sc