diff --git a/config/config.go b/config/config.go
index 85e946d..0ea7967 100644
--- a/config/config.go
+++ b/config/config.go
@@ -1,6 +1,7 @@
 // Package config initializes all files required for Amfora, even those used by
 // other packages. It also reads in the config file and initializes a Viper and
 // the theme
+//nolint:golint,goerr113
 package config
 
 import (
@@ -41,7 +42,6 @@ var DownloadsDir string
 // Command for opening HTTP(S) URLs in the browser, from "a-general.http" in config.
 var HTTPCommand []string
 
-//nolint:golint,goerr113
 func Init() error {
 
 	// *** Set paths ***
diff --git a/display/private.go b/display/private.go
index 474d998..a189931 100644
--- a/display/private.go
+++ b/display/private.go
@@ -458,7 +458,12 @@ func handleURL(t *tab, u string, numRedirects int) (string, bool) {
 		}
 
 		page.Width = termW
-		go cache.AddPage(page)
+
+		if !client.HasClientCert(parsed.Host) {
+			// Don't cache pages with client certs
+			go cache.AddPage(page)
+		}
+
 		setPage(t, page)
 		return ret(u, true)
 	}