Merge pull request #1026 from DavidKarlas/cacheThreadInfo