Made cache mode and merge mode into enums / moved comments around