diff --git a/builtin/credential/app-id/backend.go b/builtin/credential/app-id/backend.go
index e0a8f88b14..a25c9ee6a0 100644
--- a/builtin/credential/app-id/backend.go
+++ b/builtin/credential/app-id/backend.go
@@ -63,7 +63,6 @@ func Backend(conf *logical.BackendConfig) (*backend, error) {
 				"login/*",
 			},
 		},
-
 		Paths: framework.PathAppend([]*framework.Path{
 			pathLogin(&b),
 			pathLoginWithAppIDPath(&b),
@@ -71,10 +70,9 @@ func Backend(conf *logical.BackendConfig) (*backend, error) {
 			b.MapAppId.Paths(),
 			b.MapUserId.Paths(),
 		),
-
-		AuthRenew: b.pathLoginRenew,
-
-		Invalidate: b.invalidate,
+		AuthRenew:   b.pathLoginRenew,
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeCredential,
 	}
 
 	b.view = conf.StorageView
diff --git a/builtin/credential/approle/backend.go b/builtin/credential/approle/backend.go
index fe4053a29c..d086d3c6d1 100644
--- a/builtin/credential/approle/backend.go
+++ b/builtin/credential/approle/backend.go
@@ -96,7 +96,8 @@ func Backend(conf *logical.BackendConfig) (*backend, error) {
 				pathTidySecretID(b),
 			},
 		),
-		Invalidate: b.invalidate,
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeCredential,
 	}
 	return b, nil
 }
diff --git a/builtin/credential/aws/backend.go b/builtin/credential/aws/backend.go
index f402552a51..9497436b4d 100644
--- a/builtin/credential/aws/backend.go
+++ b/builtin/credential/aws/backend.go
@@ -113,8 +113,8 @@ func Backend(conf *logical.BackendConfig) (*backend, error) {
 			pathIdentityWhitelist(b),
 			pathTidyIdentityWhitelist(b),
 		},
-
-		Invalidate: b.invalidate,
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeCredential,
 	}
 
 	return b, nil
diff --git a/builtin/credential/cert/backend.go b/builtin/credential/cert/backend.go
index 5436581941..9420164eb2 100644
--- a/builtin/credential/cert/backend.go
+++ b/builtin/credential/cert/backend.go
@@ -20,13 +20,11 @@ func Backend() *backend {
 	var b backend
 	b.Backend = &framework.Backend{
 		Help: backendHelp,
-
 		PathsSpecial: &logical.Paths{
 			Unauthenticated: []string{
 				"login",
 			},
 		},
-
 		Paths: append([]*framework.Path{
 			pathConfig(&b),
 			pathLogin(&b),
@@ -34,10 +32,9 @@ func Backend() *backend {
 			pathCerts(&b),
 			pathCRLs(&b),
 		}),
-
-		AuthRenew: b.pathLoginRenew,
-
-		Invalidate: b.invalidate,
+		AuthRenew:   b.pathLoginRenew,
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeCredential,
 	}
 
 	b.crlUpdateMutex = &sync.RWMutex{}
diff --git a/builtin/credential/github/backend.go b/builtin/credential/github/backend.go
index 208aaaf472..b53e95f986 100644
--- a/builtin/credential/github/backend.go
+++ b/builtin/credential/github/backend.go
@@ -50,7 +50,8 @@ func Backend() *backend {
 			pathLogin(&b),
 		}, allPaths...),
 
-		AuthRenew: b.pathLoginRenew,
+		AuthRenew:   b.pathLoginRenew,
+		BackendType: logical.TypeCredential,
 	}
 
 	return &b
diff --git a/builtin/credential/ldap/backend.go b/builtin/credential/ldap/backend.go
index 15456001e8..ac3b8b02c5 100644
--- a/builtin/credential/ldap/backend.go
+++ b/builtin/credential/ldap/backend.go
@@ -43,7 +43,8 @@ func Backend() *backend {
 			mfa.MFAPaths(b.Backend, pathLogin(&b))...,
 		),
 
-		AuthRenew: b.pathLoginRenew,
+		AuthRenew:   b.pathLoginRenew,
+		BackendType: logical.TypeCredential,
 	}
 
 	return &b
diff --git a/builtin/credential/okta/backend.go b/builtin/credential/okta/backend.go
index 3957ea5988..625b8493a4 100644
--- a/builtin/credential/okta/backend.go
+++ b/builtin/credential/okta/backend.go
@@ -35,7 +35,8 @@ func Backend() *backend {
 			pathLogin(&b),
 		}),
 
-		AuthRenew: b.pathLoginRenew,
+		AuthRenew:   b.pathLoginRenew,
+		BackendType: logical.TypeCredential,
 	}
 
 	return &b
diff --git a/builtin/credential/radius/backend.go b/builtin/credential/radius/backend.go
index 6404b8c31c..49dcb7f6f0 100644
--- a/builtin/credential/radius/backend.go
+++ b/builtin/credential/radius/backend.go
@@ -36,7 +36,8 @@ func Backend() *backend {
 			mfa.MFAPaths(b.Backend, pathLogin(&b))...,
 		),
 
-		AuthRenew: b.pathLoginRenew,
+		AuthRenew:   b.pathLoginRenew,
+		BackendType: logical.TypeCredential,
 	}
 
 	return &b
diff --git a/builtin/credential/userpass/backend.go b/builtin/credential/userpass/backend.go
index f87f5e3714..65f67e149f 100644
--- a/builtin/credential/userpass/backend.go
+++ b/builtin/credential/userpass/backend.go
@@ -36,7 +36,8 @@ func Backend() *backend {
 			mfa.MFAPaths(b.Backend, pathLogin(&b))...,
 		),
 
-		AuthRenew: b.pathLoginRenew,
+		AuthRenew:   b.pathLoginRenew,
+		BackendType: logical.TypeCredential,
 	}
 
 	return &b
diff --git a/builtin/logical/aws/backend.go b/builtin/logical/aws/backend.go
index a0121118cd..b6341e0620 100644
--- a/builtin/logical/aws/backend.go
+++ b/builtin/logical/aws/backend.go
@@ -42,6 +42,7 @@ func Backend() *backend {
 
 		WALRollback:       walRollback,
 		WALRollbackMinAge: 5 * time.Minute,
+		BackendType:       logical.TypeLogical,
 	}
 
 	return &b
diff --git a/builtin/logical/cassandra/backend.go b/builtin/logical/cassandra/backend.go
index cd455a182f..dd54ba5b42 100644
--- a/builtin/logical/cassandra/backend.go
+++ b/builtin/logical/cassandra/backend.go
@@ -40,6 +40,7 @@ func Backend() *backend {
 		Clean: func() {
 			b.ResetDB(nil)
 		},
+		BackendType: logical.TypeLogical,
 	}
 
 	return &b
diff --git a/builtin/logical/consul/backend.go b/builtin/logical/consul/backend.go
index cd19f636b6..9fd09ac811 100644
--- a/builtin/logical/consul/backend.go
+++ b/builtin/logical/consul/backend.go
@@ -26,6 +26,7 @@ func Backend() *backend {
 		Secrets: []*framework.Secret{
 			secretToken(&b),
 		},
+		BackendType: logical.TypeLogical,
 	}
 
 	return &b
diff --git a/builtin/logical/database/backend.go b/builtin/logical/database/backend.go
index fe227dd3db..ffc1a40aa6 100644
--- a/builtin/logical/database/backend.go
+++ b/builtin/logical/database/backend.go
@@ -40,10 +40,9 @@ func Backend(conf *logical.BackendConfig) *databaseBackend {
 		Secrets: []*framework.Secret{
 			secretCreds(&b),
 		},
-
-		Clean: b.closeAllDBs,
-
-		Invalidate: b.invalidate,
+		Clean:       b.closeAllDBs,
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeLogical,
 	}
 
 	b.logger = conf.Logger
diff --git a/builtin/logical/mongodb/backend.go b/builtin/logical/mongodb/backend.go
index 52f4342122..d850e8aa8b 100644
--- a/builtin/logical/mongodb/backend.go
+++ b/builtin/logical/mongodb/backend.go
@@ -38,7 +38,8 @@ func Backend() *framework.Backend {
 
 		Clean: b.ResetSession,
 
-		Invalidate: b.invalidate,
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeLogical,
 	}
 
 	return b.Backend
diff --git a/builtin/logical/mssql/backend.go b/builtin/logical/mssql/backend.go
index 44aac36d5a..ccd981badd 100644
--- a/builtin/logical/mssql/backend.go
+++ b/builtin/logical/mssql/backend.go
@@ -36,9 +36,9 @@ func Backend() *backend {
 			secretCreds(&b),
 		},
 
-		Invalidate: b.invalidate,
-
-		Clean: b.ResetDB,
+		Invalidate:  b.invalidate,
+		Clean:       b.ResetDB,
+		BackendType: logical.TypeLogical,
 	}
 
 	return &b
diff --git a/builtin/logical/mysql/backend.go b/builtin/logical/mysql/backend.go
index 4e97330278..a89cc49de3 100644
--- a/builtin/logical/mysql/backend.go
+++ b/builtin/logical/mysql/backend.go
@@ -36,9 +36,9 @@ func Backend() *backend {
 			secretCreds(&b),
 		},
 
-		Invalidate: b.invalidate,
-
-		Clean: b.ResetDB,
+		Invalidate:  b.invalidate,
+		Clean:       b.ResetDB,
+		BackendType: logical.TypeLogical,
 	}
 
 	return &b
diff --git a/builtin/logical/pki/backend.go b/builtin/logical/pki/backend.go
index ff2c74b637..061ad0ea48 100644
--- a/builtin/logical/pki/backend.go
+++ b/builtin/logical/pki/backend.go
@@ -68,6 +68,8 @@ func Backend() *backend {
 		Secrets: []*framework.Secret{
 			secretCerts(&b),
 		},
+
+		BackendType: logical.TypeLogical,
 	}
 
 	b.crlLifetime = time.Hour * 72
diff --git a/builtin/logical/postgresql/backend.go b/builtin/logical/postgresql/backend.go
index 2b9dac9759..4a689f899b 100644
--- a/builtin/logical/postgresql/backend.go
+++ b/builtin/logical/postgresql/backend.go
@@ -37,9 +37,9 @@ func Backend(conf *logical.BackendConfig) *backend {
 			secretCreds(&b),
 		},
 
-		Clean: b.ResetDB,
-
-		Invalidate: b.invalidate,
+		Clean:       b.ResetDB,
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeLogical,
 	}
 
 	b.logger = conf.Logger
diff --git a/builtin/logical/rabbitmq/backend.go b/builtin/logical/rabbitmq/backend.go
index 3ad8df6762..1e3f1ec061 100644
--- a/builtin/logical/rabbitmq/backend.go
+++ b/builtin/logical/rabbitmq/backend.go
@@ -38,9 +38,9 @@ func Backend() *backend {
 			secretCreds(&b),
 		},
 
-		Clean: b.resetClient,
-
-		Invalidate: b.invalidate,
+		Clean:       b.resetClient,
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeLogical,
 	}
 
 	return &b
diff --git a/builtin/logical/ssh/backend.go b/builtin/logical/ssh/backend.go
index 5633ac0c27..c14685d328 100644
--- a/builtin/logical/ssh/backend.go
+++ b/builtin/logical/ssh/backend.go
@@ -62,7 +62,8 @@ func Backend(conf *logical.BackendConfig) (*backend, error) {
 			secretOTP(&b),
 		},
 
-		Invalidate: b.invalidate,
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeLogical,
 	}
 	return &b, nil
 }
diff --git a/builtin/logical/totp/backend.go b/builtin/logical/totp/backend.go
index 91a803879c..936b46b4ee 100644
--- a/builtin/logical/totp/backend.go
+++ b/builtin/logical/totp/backend.go
@@ -28,7 +28,8 @@ func Backend() *backend {
 			pathCode(&b),
 		},
 
-		Secrets: []*framework.Secret{},
+		Secrets:     []*framework.Secret{},
+		BackendType: logical.TypeLogical,
 	}
 
 	b.usedCodes = cache.New(0, 30*time.Second)
diff --git a/builtin/logical/transit/backend.go b/builtin/logical/transit/backend.go
index 7857776e92..db85ba1af2 100644
--- a/builtin/logical/transit/backend.go
+++ b/builtin/logical/transit/backend.go
@@ -38,9 +38,9 @@ func Backend(conf *logical.BackendConfig) *backend {
 			b.pathVerify(),
 		},
 
-		Secrets: []*framework.Secret{},
-
-		Invalidate: b.invalidate,
+		Secrets:     []*framework.Secret{},
+		Invalidate:  b.invalidate,
+		BackendType: logical.TypeLogical,
 	}
 
 	b.lm = keysutil.NewLockManager(conf.System.CachingDisabled())