Guard concurrent cache access
Merge pull request #67 from ironcladlou/race-fixes

Guard concurrent cache access