diff --git a/.travis.yml b/.travis.yml
index d800be75..afcf7e0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,32 @@
+addons:
+  postgresql: 9.6
+dist: trusty
 language: ruby
+cache: bundler
+
 rvm:
-  - 2.2.4
-  - 2.3.1
+  - 2.6.3
   - jruby-9.0.5.0
+
 gemfile:
   - gemfiles/rails_5_1.gemfile
+
 bundler_args: --without local
 before_install:
-  - gem install bundler -v '> 1.5.0'
+  - gem update --system
+  - gem install bundler
+
+before_script:
+  - psql -c 'create database apartment_postgresql_test;' -U postgres
+
 env:
   RUBY_GC_MALLOC_LIMIT: 90000000
   RUBY_FREE_MIN: 200000
+
 matrix:
   fast_finish: true
+
+notifications:
+  email:
+    on_success: never
+    on_failure: always
diff --git a/lib/apartment/adapters/abstract_adapter.rb b/lib/apartment/adapters/abstract_adapter.rb
index 29e4988c..2dd183ab 100644
--- a/lib/apartment/adapters/abstract_adapter.rb
+++ b/lib/apartment/adapters/abstract_adapter.rb
@@ -83,7 +83,7 @@ def switch!(tenant)
 
           @current = tenant
 
-          Apartment.connection.clear_query_cache
+          Apartment.connection_class.clear_query_caches_for_current_thread
 
           tenant
         end
@@ -143,6 +143,7 @@ def connection_switch!(config, without_keys: [])
         end
 
         Thread.current[:_apartment_connection_specification_name] = config[:name]
+        Apartment.connection_class.connection_specification_name = config[:name]
         simple_switch(config)
       end
 
diff --git a/lib/apartment/version.rb b/lib/apartment/version.rb
index aedfbb55..28db8775 100644
--- a/lib/apartment/version.rb
+++ b/lib/apartment/version.rb
@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end