diff --git a/core/storage/btree.rs b/core/storage/btree.rs
index 4b1fe68c4..4ae59cd74 100644
--- a/core/storage/btree.rs
+++ b/core/storage/btree.rs
@@ -846,8 +846,7 @@ impl BTreeCursor {
                             cell_payload.as_slice(),
                             cell_idx,
                             self.usable_space() as u16,
-                        )
-                        .unwrap();
+                        )?;
                         contents.overflow_cells.len()
                     };
                     let write_info = self
diff --git a/core/storage/pager.rs b/core/storage/pager.rs
index eb4255a3b..5c43eee1a 100644
--- a/core/storage/pager.rs
+++ b/core/storage/pager.rs
@@ -122,7 +122,7 @@ impl Page {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 enum FlushState {
     Start,
     WaitAppendFrames,
@@ -261,11 +261,11 @@ impl Pager {
 
     /// Reads a page from the database.
     pub fn read_page(&self, page_idx: usize) -> Result<PageRef> {
-        trace!("read_page(page_idx = {})", page_idx);
+        tracing::debug!("read_page(page_idx = {})", page_idx);
         let mut page_cache = self.page_cache.write();
         let page_key = PageCacheKey::new(page_idx, Some(self.wal.borrow().get_max_frame()));
         if let Some(page) = page_cache.get(&page_key) {
-            trace!("read_page(page_idx = {}) = cached", page_idx);
+            tracing::debug!("read_page(page_idx = {}) = cached", page_idx);
             return Ok(page.clone());
         }
         let page = Arc::new(Page::new(page_idx));
@@ -348,6 +348,7 @@ impl Pager {
         let mut checkpoint_result = CheckpointResult::new();
         loop {
             let state = self.flush_info.borrow().state.clone();
+            trace!("cacheflush {:?}", state);
             match state {
                 FlushState::Start => {
                     let db_size = self.db_header.lock().unwrap().database_size;
@@ -363,6 +364,10 @@ impl Pager {
                             db_size,
                             self.flush_info.borrow().in_flight_writes.clone(),
                         )?;
+                        // This page is no longer valid.
+                        // For example:
+                        // We took page with key (page_num, max_frame) -- this page is no longer valid for that max_frame so it must be invalidated.
+                        cache.delete(page_key);
                     }
                     self.dirty_pages.borrow_mut().clear();
                     self.flush_info.borrow_mut().state = FlushState::WaitAppendFrames;