updated lock and added caches
Merge branch 'master' of https://github.com/DorkScript/my-boxen