Merge pull request #1036 from DavidKarlas/cacheSdbLocking