diff --git a/src/charset.c b/src/charset.c
index 0e4dbbe..3ea2ecb 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -971,6 +971,9 @@
     cts->cts_vcol = col;
     cts->cts_line = line;
     cts->cts_ptr = ptr;
+#ifdef FEAT_LINEBREAK
+    cts->cts_bri_size = -1;
+#endif
 #ifdef FEAT_PROP_POPUP
     if (lnum > 0 && !ignore_text_props)
     {
@@ -1282,7 +1285,11 @@
 	    if (*sbr != NUL)
 		head_prev += vim_strsize(sbr);
 	    if (wp->w_p_bri)
-		head_prev += get_breakindent_win(wp, line);
+	    {
+		if (cts->cts_bri_size < 0)
+		    cts->cts_bri_size = get_breakindent_win(wp, line);
+		head_prev += cts->cts_bri_size;
+	    }
 	    if (wcol < head_prev)
 	    {
 		head_prev -= wcol;
@@ -1303,7 +1310,11 @@
 	    if (*sbr != NUL)
 		head_mid += vim_strsize(sbr);
 	    if (wp->w_p_bri)
-		head_mid += get_breakindent_win(wp, line);
+	    {
+		if (cts->cts_bri_size < 0)
+		    cts->cts_bri_size = get_breakindent_win(wp, line);
+		head_mid += cts->cts_bri_size;
+	    }
 	    if (head_mid > 0 && wcol + size > wp->w_width)
 	    {
 		// Calculate effective window width.
diff --git a/src/structs.h b/src/structs.h
index da8c2e2..76f1433 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -4909,6 +4909,10 @@
     win_T	*cts_win;
     char_u	*cts_line;		// start of the line
     char_u	*cts_ptr;		// current position in line
+#ifdef FEAT_LINEBREAK
+    int		cts_bri_size;		// cached size of 'breakindent', or -1
+					// if not computed yet
+#endif
 #ifdef FEAT_PROP_POPUP
     int		cts_text_prop_count;	// number of text props; when zero
 					// cts_text_props is not used
diff --git a/src/version.c b/src/version.c
index bcc43f2..47f2997 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    37,
+/**/
     36,
 /**/
     35,