diff --git a/passes/hierarchy/hierarchy.cc b/passes/hierarchy/hierarchy.cc
index dceda1624..08b14dca0 100644
--- a/passes/hierarchy/hierarchy.cc
+++ b/passes/hierarchy/hierarchy.cc
@@ -684,30 +684,24 @@ void hierarchy_clean(RTLIL::Design *design, RTLIL::Module *top, bool purge_lib)
 
 bool set_keep_print(std::map<RTLIL::Module*, bool> &cache, RTLIL::Module *mod)
 {
-	auto it = cache.find(mod);
-	if (it != cache.end())
-		return it->second;
-	cache[mod] = false;
-	for (auto c : mod->cells()) {
-		RTLIL::Module *m = mod->design->module(c->type);
-		if ((m != nullptr && set_keep_print(cache, m)) || c->type == ID($print))
-			return cache[mod] = true;
-	}
-	return false;
+	if (cache.count(mod) == 0)
+		for (auto c : mod->cells()) {
+			RTLIL::Module *m = mod->design->module(c->type);
+			if ((m != nullptr && set_keep_print(cache, m)) || c->type == ID($print))
+				return cache[mod] = true;
+		}
+	return cache[mod];
 }
 
 bool set_keep_assert(std::map<RTLIL::Module*, bool> &cache, RTLIL::Module *mod)
 {
-	auto it = cache.find(mod);
-	if (it != cache.end())
-		return it->second;
-	cache[mod] = false;
-	for (auto c : mod->cells()) {
-		RTLIL::Module *m = mod->design->module(c->type);
-		if ((m != nullptr && set_keep_assert(cache, m)) || c->type.in(ID($check), ID($assert), ID($assume), ID($live), ID($fair), ID($cover)))
-			return cache[mod] = true;
-	}
-	return false;
+	if (cache.count(mod) == 0)
+		for (auto c : mod->cells()) {
+			RTLIL::Module *m = mod->design->module(c->type);
+			if ((m != nullptr && set_keep_assert(cache, m)) || c->type.in(ID($check), ID($assert), ID($assume), ID($live), ID($fair), ID($cover)))
+				return cache[mod] = true;
+		}
+	return cache[mod];
 }
 
 int find_top_mod_score(Design *design, Module *module, dict<Module*, int> &db)
diff --git a/tests/various/hierarchy_recursive.v b/tests/various/hierarchy_recursive.v
deleted file mode 100644
index 9e68528fa..000000000
--- a/tests/various/hierarchy_recursive.v
+++ /dev/null
@@ -1,3 +0,0 @@
-module top(input x, output y);
-top top_i(.x(x), .y(y));
-endmodule
diff --git a/tests/various/hierarchy_recursive.ys b/tests/various/hierarchy_recursive.ys
deleted file mode 100644
index e9f203828..000000000
--- a/tests/various/hierarchy_recursive.ys
+++ /dev/null
@@ -1,25 +0,0 @@
-read_verilog hierarchy_recursive.v
-hierarchy -auto-top
-select -assert-any top
-select -assert-none a:keep
-
-design -reset
-read_verilog <<EOT
-module top(input x, output y);
-top top_i(.x(x), .y(y));
-always @(x) $display("x=%d", x);
-endmodule
-EOT
-hierarchy -auto-top
-select -assert-any top %% a:keep
-
-design -reset
-read_verilog -formal <<EOT
-module a(input x); b b_i(.x(x)); endmodule
-module b(input x); a a_i(.x(x)); always @(x) assert (x == x); endmodule
-module top(input x); a a_i(.x(x)); endmodule
-EOT
-hierarchy -top top
-select -assert-any a %% a:keep
-select -assert-any b %% a:keep
-select -assert-any top %% a:keep