diff --git a/clover.rb b/clover.rb
index fb1ec3509..cd33cbdba 100644
--- a/clover.rb
+++ b/clover.rb
@@ -6,16 +6,6 @@
 require "roda"
 
 class Clover < Roda
-  def self.freeze
-    # :nocov:
-    unless Config.test?
-      Sequel::Model.freeze_descendents
-      DB.freeze
-    end
-    # :nocov:
-    super
-  end
-
   route do |r|
     r.on "api" do
       r.run CloverApi
diff --git a/clover_web.rb b/clover_web.rb
index ea105d31b..2d1b17f87 100644
--- a/clover_web.rb
+++ b/clover_web.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "mail"
+require "roda"
 require "tilt"
 require "tilt/erubi"
 
diff --git a/lib/billing_rate.rb b/lib/billing_rate.rb
index bac8d591e..7eebf2960 100644
--- a/lib/billing_rate.rb
+++ b/lib/billing_rate.rb
@@ -3,6 +3,8 @@
 require "yaml"
 
 class BillingRate
+  @@rates = nil
+
   def self.rates
     @@rates ||= YAML.load_file("config/billing_rates.yml")
   end
diff --git a/lib/github.rb b/lib/github.rb
index e42ecc491..653964cf3 100644
--- a/lib/github.rb
+++ b/lib/github.rb
@@ -30,6 +30,8 @@ def self.installation_client(installation_id)
     client
   end
 
+  @@runner_labels = nil
+
   def self.runner_labels
     @@runner_labels ||= YAML.load_file("config/github_runner_labels.yml").to_h { [_1["name"], _1] }
   end
diff --git a/loader.rb b/loader.rb
index 90a6914bd..0856e44bd 100644
--- a/loader.rb
+++ b/loader.rb
@@ -19,7 +19,7 @@
 Unreloader.autoload("#{__dir__}/db.rb") { "DB" }
 Unreloader.autoload("#{__dir__}/ubid.rb") { "UBID" }
 
-AUTOLOAD_CONSTANTS = ["DB", "UBID"]
+AUTOLOAD_CONSTANTS = ["DB", "UBID", "Clover"]
 
 # Set up autoloads using Unreloader using a style much like Zeitwerk:
 # directories are modules, file names are classes.
@@ -83,7 +83,7 @@
 AUTOLOAD_CONSTANTS.freeze
 
 if Config.production?
-  AUTOLOAD_CONSTANTS.each { Object.const_get(_1) }
+  AUTOLOAD_CONSTANTS.map { Object.const_get(_1) }.each(&:freeze)
 end
 
 def clover_freeze
diff --git a/model/page.rb b/model/page.rb
index defa95583..da549c57e 100644
--- a/model/page.rb
+++ b/model/page.rb
@@ -16,6 +16,8 @@ def active
   include ResourceMethods
   semaphore :resolve
 
+  @@pagerduty_client = nil
+
   def pagerduty_client
     @@pagerduty_client ||= Pagerduty.build(integration_key: Config.pagerduty_key, api_version: 2)
   end
diff --git a/prog/postgres/postgres_resource_nexus.rb b/prog/postgres/postgres_resource_nexus.rb
index 83a842db9..e30cb5895 100644
--- a/prog/postgres/postgres_resource_nexus.rb
+++ b/prog/postgres/postgres_resource_nexus.rb
@@ -210,6 +210,8 @@ def create_certificate
     ).map(&:to_pem)
   end
 
+  @@dns_zone = nil
+
   def self.dns_zone
     @@dns_zone ||= DnsZone[project_id: Config.postgres_service_project_id, name: Config.postgres_service_hostname]
   end