diff --git a/src/git.zig b/src/git.zig
index 29a27fe..1e76a40 100644
--- a/src/git.zig
+++ b/src/git.zig
@@ -20,16 +20,26 @@ pub fn workspace_path(context_: usize) Error!void {
 
 pub fn current_branch(context_: usize) Error!void {
     const fn_name = @src().fn_name;
+    if (current_branch_cache) |p| {
+        tp.self_pid().send(.{ module_name, context_, fn_name, p.branch }) catch {};
+        return;
+    }
     try git(context_, .{ "rev-parse", "--abbrev-ref", "HEAD" }, struct {
         fn result(context: usize, parent: tp.pid_ref, output: []const u8) void {
             var it = std.mem.splitScalar(u8, output, '\n');
             while (it.next()) |value| if (value.len > 0) {
+                blk: {
+                    current_branch_cache = .{ .branch = allocator.dupeZ(u8, value) catch break :blk };
+                }
                 parent.send(.{ module_name, context, fn_name, value }) catch {};
                 return;
             };
         }
     }.result, exit_null_on_error(fn_name));
 }
+var current_branch_cache: ?struct {
+    branch: ?[:0]const u8 = null,
+} = null;
 
 pub fn workspace_files(context: usize) Error!void {
     return git_line_output(
diff --git a/src/shell.zig b/src/shell.zig
index 69746cb..116820b 100644
--- a/src/shell.zig
+++ b/src/shell.zig
@@ -169,25 +169,20 @@ const Process = struct {
     }
 
     fn deinit(self: *Process) void {
-        if (self.sp) |*sp| {
-            defer self.sp = null;
-            sp.deinit();
-        }
+        if (self.sp) |*sp| sp.deinit();
         self.parent.deinit();
         self.logger.deinit();
         self.allocator.free(self.arg0);
         self.allocator.free(self.argv.buf);
+        self.close() catch {};
         self.allocator.destroy(self);
     }
 
-    fn close(self: *Process) void {
-        defer self.sp = null;
-        if (self.sp) |*sp| sp.close() catch {};
-    }
-
-    fn term(self: *Process) void {
-        defer self.sp = null;
-        if (self.sp) |*sp| sp.term() catch {};
+    fn close(self: *Process) tp.result {
+        if (self.sp) |*sp| {
+            defer self.sp = null;
+            try sp.close();
+        }
     }
 
     fn start(self: *Process) tp.result {
@@ -209,17 +204,14 @@ const Process = struct {
             const sp = self.sp orelse return tp.exit_error(error.Closed, null);
             try sp.send(bytes);
         } else if (try m.match(.{"close"})) {
-            self.close();
+            try self.close();
         } else if (try m.match(.{ module_name, "stdout", tp.extract(&bytes) })) {
             self.handlers.out(self.handlers.context, self.parent.ref(), self.arg0, bytes);
         } else if (try m.match(.{ module_name, "stderr", tp.extract(&bytes) })) {
             (self.handlers.err orelse self.handlers.out)(self.handlers.context, self.parent.ref(), self.arg0, bytes);
         } else if (try m.match(.{ module_name, "term", tp.more })) {
-            defer self.sp = null;
             self.handle_terminated(m) catch |e| return tp.exit_error(e, @errorReturnTrace());
-            return tp.exit_normal();
         } else if (try m.match(.{ "exit", "normal" })) {
-            self.term();
             return tp.exit_normal();
         } else {
             self.logger.err("receive", tp.unexpected(m));