diff --git a/verilog-ext-workspace.el b/verilog-ext-workspace.el
index 6e3c5c6..f5fd735 100644
--- a/verilog-ext-workspace.el
+++ b/verilog-ext-workspace.el
@@ -165,10 +165,15 @@ If optional TYPE arg is passed, only deserialize that TYPE."
 If optional TYPE arg is passed, only clear that TYPE."
   (interactive)
   (pcase type
-    ('typedefs  (setq verilog-ext-workspace-cache-typedefs  nil))
-    ('tags-defs (setq verilog-ext-workspace-cache-tags-defs nil))
-    ('tags-refs (setq verilog-ext-workspace-cache-tags-refs nil))
-    ('tags-inst (setq verilog-ext-workspace-cache-tags-inst nil))
+    ('typedefs  (setq verilog-ext-workspace-cache-typedefs  nil)
+                (setq verilog-ext-typedef-align-words-re nil)
+                (setq verilog-align-typedef-regexp nil))
+    ('tags-defs (setq verilog-ext-workspace-cache-tags-defs nil)
+                (setq verilog-ext-workspace-tags-defs-table nil))
+    ('tags-refs (setq verilog-ext-workspace-cache-tags-refs nil)
+                (setq verilog-ext-workspace-tags-refs-table nil))
+    ('tags-inst (setq verilog-ext-workspace-cache-tags-inst nil)
+                (setq verilog-ext-workspace-tags-inst-table nil))
     ('hierarchy (setq verilog-ext-workspace-cache-hierarchy nil)
                 (setq verilog-ext-hierarchy-current-flat-hierarchy nil))
     (_ (setq verilog-ext-workspace-cache-typedefs  nil)
@@ -176,6 +181,11 @@ If optional TYPE arg is passed, only clear that TYPE."
        (setq verilog-ext-workspace-cache-tags-refs nil)
        (setq verilog-ext-workspace-cache-tags-inst nil)
        (setq verilog-ext-workspace-cache-hierarchy nil)
+       (setq verilog-ext-typedef-align-words-re nil)
+       (setq verilog-align-typedef-regexp nil)
+       (setq verilog-ext-workspace-tags-defs-table nil)
+       (setq verilog-ext-workspace-tags-refs-table nil)
+       (setq verilog-ext-workspace-tags-inst-table nil)
        (setq verilog-ext-hierarchy-current-flat-hierarchy nil)))
   (verilog-ext-workspace-serialize-cache type)
   (message "Cleared cache!"))