Merge pull request #1725 from alexanderkyte/cache_crash