diff --git a/tests/TenantClassTest.php b/tests/TenantClassTest.php
new file mode 100644
index 00000000..55fe2e19
--- /dev/null
+++ b/tests/TenantClassTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Stancl\Tenancy\Tests;
+
+use Mockery;
+use Stancl\Tenancy\Contracts\StorageDriver;
+use Stancl\Tenancy\Tenant;
+
+class TenantClassTest extends TestCase
+{
+    public $autoInitTenancy = false;
+    public $autoCreateTenant = false;
+
+    /** @test */
+    public function data_cache_works_properly()
+    { 
+        $spy = Mockery::spy(config('tenancy.storage_driver'))->makePartial();
+        $this->instance(StorageDriver::class, $spy);
+
+        $tenant = Tenant::create(['foo.localhost'], ['foo' => 'bar']);
+        $this->assertSame('bar', $tenant->data['foo']);
+
+        $tenant->put('abc', 'xyz');
+        $this->assertSame('xyz', $tenant->data['abc']);
+
+        $tenant->put(['aaa' => 'bbb', 'ccc' => 'ddd']);
+        $this->assertSame('bbb', $tenant->data['aaa']);
+        $this->assertSame('ddd', $tenant->data['ccc']);
+
+        $spy->shouldNotHaveReceived('get');
+        Mockery::close();
+    }
+}
\ No newline at end of file