Merge pull request #310 from the-hideout/no-cache-error-data

Merge pull request #310 from the-hideout/no-cache-error-data #826