- Simplified/reorganized version of patch #9620 by Jeremy: fixed errors when writing to cache.