Merge fix from master on cache update.