Merge "Update xattrs when creating cache directories."