Disable caching of the default value if configured that way

config/settings.php

@@ -163,4 +163,16 @@
     |
     */
     'value_serializer' => \Rawilk\Settings\Support\ValueSerializers\ValueSerializer::class,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cache Default Value
+    |--------------------------------------------------------------------------
+    |
+    | When a setting is not persisted, we will cache the passed in default value
+    | if this is set to true. This may not always be desirable, so you can
+    | disable it here if needed.
+    |
+    */
+    'cache_default_value' => true,
 ];

src/Settings.php

@@ -44,6 +44,12 @@ class Settings
     // Meant for internal use only.
     protected bool $resetContext = true;
 
+    /**
+     * If true, we will cache the default value for a setting when it is not persisted
+     * when trying to retrieve it.
+     */
+    protected bool $cacheDefaultValue = true;
+
     protected bool $teams = false;
 
     /** @var null|string|int */
@@ -110,6 +116,13 @@ public function setTeamForeignKey(?string $foreignKey): self
         return $this;
     }
 
+    public function cacheDefaultValue(bool $cacheDefaultValue = true): self
+    {
+        $this->cacheDefaultValue = $cacheDefaultValue;
+
+        return $this;
+    }
+
     public function forget(string|BackedEnum $key)
     {
         $key = $this->normalizeKey($key);
@@ -154,7 +167,7 @@ public function get(string|BackedEnum $key, $default = null)
                 $this->getCacheKey($generatedKey),
                 fn () => $this->driver->get(
                     key: $generatedKey,
-                    default: $default,
+                    default: $this->cacheDefaultValue ? $default : null,
                     teamId: $this->teams ? $this->teamId : false,
                 )
             );

src/SettingsServiceProvider.php

@@ -77,6 +77,8 @@ protected function registerSettings(): void
 
             $settings->setCache($app['cache.store']);
 
+            $settings->cacheDefaultValue($app['config']['settings.cache_default_value'] ?? false);
+
             if (config('app.key')) {
                 $settings->setEncrypter($app['encrypter']);
             }

tests/Feature/SettingsTest.php

@@ -27,6 +27,7 @@
         'settings.table' => 'settings',
         'settings.cache' => false,
         'settings.encryption' => false,
+        'settings.cache_default_value' => true,
     ]);
 
     setDatabaseDriverConnection();
@@ -517,6 +518,20 @@
     SettingsFacade::get(InvalidEnumTypeEnum::Foo);
 })->throws(InvalidEnumType::class);
 
+test('if configured to not cache default values, it does not cache the default value if the requested setting is not persisted', function () {
+    settings()->enableCache()->cacheDefaultValue(false);
+
+    expect(settings()->get('foo', 'default value 1'))->toBe('default value 1')
+        ->and(settings()->get('foo', 'default value 2'))->toBe('default value 2');
+});
+
+it('caches the default value if configured to', function () {
+    settings()->enableCache()->cacheDefaultValue(true);
+
+    expect(settings()->get('foo', 'default value 1'))->toBe('default value 1')
+        ->and(settings()->get('foo', 'default value 2'))->toBe('default value 1');
+});
+
 // Helpers...
 
 function assertQueryCount(int $expected): void