diff --git a/test-validator/src/lib.rs b/test-validator/src/lib.rs
index 529fd69b3..bc99f78c9 100644
--- a/test-validator/src/lib.rs
+++ b/test-validator/src/lib.rs
@@ -104,6 +104,7 @@ pub struct TestValidatorGenesis {
     pub max_ledger_shreds: Option<u64>,
     pub max_genesis_archive_unpacked_size: Option<u64>,
     pub accountsdb_plugin_config_files: Option<Vec<PathBuf>>,
+    pub accounts_db_caching_enabled: bool,
 }
 
 impl TestValidatorGenesis {
@@ -556,6 +557,7 @@ impl TestValidator {
 
         let mut validator_config = ValidatorConfig {
             accountsdb_plugin_config_files: config.accountsdb_plugin_config_files.clone(),
+            accounts_db_caching_enabled: config.accounts_db_caching_enabled,
             rpc_addrs: Some((
                 SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), node.info.rpc.port()),
                 SocketAddr::new(
diff --git a/validator/src/bin/solana-test-validator.rs b/validator/src/bin/solana-test-validator.rs
index 77e4c2aa8..34bc7ec74 100644
--- a/validator/src/bin/solana-test-validator.rs
+++ b/validator/src/bin/solana-test-validator.rs
@@ -305,6 +305,11 @@ fn main() {
                 .hidden(true)
                 .help("Specify the configuration file for the AccountsDb plugin."),
         )
+        .arg(
+            Arg::with_name("no_accounts_db_caching")
+                .long("no-accounts-db-caching")
+                .help("Disables accounts caching"),
+        )
         .get_matches();
 
     let output = if matches.is_present("quiet") {
@@ -550,6 +555,7 @@ fn main() {
     let mut genesis = TestValidatorGenesis::default();
     genesis.max_ledger_shreds = value_of(&matches, "limit_ledger_size");
     genesis.max_genesis_archive_unpacked_size = Some(u64::MAX);
+    genesis.accounts_db_caching_enabled = !matches.is_present("no_accounts_db_caching");
 
     let tower_storage = Arc::new(FileTowerStorage::new(ledger_path.clone()));