Merge pull request #1035 from DavidKarlas/cacheSdb