Merge in fix for cache not being clean.