diff --git a/src/memline.c b/src/memline.c
index 0e3bdb8..b9de06e 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -2836,8 +2836,10 @@
 
 #ifdef FEAT_EVAL
     // When inserting above recorded changes: flush the changes before changing
-    // the text.
+    // the text.  Then flush the cached line, it may become invalid.
     may_invoke_listeners(buf, lnum + 1, lnum + 1, 1);
+    if (curbuf->b_ml.ml_line_lnum != 0)
+	ml_flush_line(curbuf);
 #endif
 
 #ifdef FEAT_TEXT_PROP
diff --git a/src/testdir/test_listener.vim b/src/testdir/test_listener.vim
index ed501c2..6a68ae6 100644
--- a/src/testdir/test_listener.vim
+++ b/src/testdir/test_listener.vim
@@ -242,3 +242,29 @@
   delfunc MyListener
   bwipe!
 endfunc
+
+" This verifies the fix for issue #4455
+func Test_listener_caches_buffer_line()
+  new
+  inoremap <silent> <CR> <CR><Esc>O
+
+  function EchoChanges(bufnr, start, end, added, changes)
+    for l:change in a:changes
+      let text = getbufline(a:bufnr, l:change.lnum, l:change.end-1+l:change.added)
+    endfor
+  endfunction
+  let lid = listener_add("EchoChanges")
+  set autoindent
+  set cindent
+
+  call setline(1, ["{", "\tif true {}", "}"])
+  exe "normal /{}\nl"
+  call feedkeys("i\r\e", 'xt')
+  call assert_equal(["{", "\tif true {", "", "\t}", "}"], getline(1, 5))
+
+  bwipe!
+  delfunc EchoChanges
+  call listener_remove(lid)
+  iunmap <CR>
+  set nocindent
+endfunc
diff --git a/src/version.c b/src/version.c
index eaa8047..fff8d22 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1681,
+/**/
     1680,
 /**/
     1679,