diff --git a/src/lib/extension/ConfigurationController.ts b/src/lib/extension/ConfigurationController.ts
index 06d2e7f..ad440f6 100644
--- a/src/lib/extension/ConfigurationController.ts
+++ b/src/lib/extension/ConfigurationController.ts
@@ -70,7 +70,7 @@ export default class ConfigurationController {
         return;
       }
 
-      callback(changes[this.#configurationName].newValue);
+      callback(changes[this.#configurationName].newValue as Record<string, any>);
     }
 
     this.#storage.subscribe(subscriber);
diff --git a/src/lib/extension/base/CacheablePreferences.ts b/src/lib/extension/base/CacheablePreferences.ts
index 315a6f3..2bcdbd2 100644
--- a/src/lib/extension/base/CacheablePreferences.ts
+++ b/src/lib/extension/base/CacheablePreferences.ts
@@ -89,16 +89,17 @@ export type WithFields<FieldsType extends Record<string, any>> = {
  * API.
  */
 export default abstract class CacheablePreferences<Fields> {
-  #controller: ConfigurationController;
-  #cachedValues: Map<keyof Fields, any> = new Map();
-  #disposables: Function[] = [];
+  readonly #controller: ConfigurationController;
+  readonly #cachedValues: Map<keyof Fields, any> = new Map();
+  readonly #disposables: Function[] = [];
 
   /**
    * @param settingsNamespace Name of the field inside the extension storage where these preferences stored.
+   * @param [controller] Configuration controller. If not provided, default controller will be used.
    * @protected
    */
-  protected constructor(settingsNamespace: string) {
-    this.#controller = new ConfigurationController(settingsNamespace);
+  protected constructor(settingsNamespace: string, controller: ConfigurationController = new ConfigurationController(settingsNamespace)) {
+    this.#controller = controller;
 
     this.#disposables.push(
       this.#controller.subscribeToChanges(settings => {
diff --git a/tests/lib/extension/base/CachablePreferences.spec.ts b/tests/lib/extension/base/CachablePreferences.spec.ts
new file mode 100644
index 0000000..93a719e
--- /dev/null
+++ b/tests/lib/extension/base/CachablePreferences.spec.ts
@@ -0,0 +1,173 @@
+import CacheablePreferences, { PreferenceField, type WithFields } from "$lib/extension/base/CacheablePreferences";
+import ConfigurationController from "$lib/extension/ConfigurationController";
+import ChromeStorageArea from "$tests/mocks/ChromeStorageArea";
+import StorageHelper from "$lib/browser/StorageHelper";
+import { randomString } from "$tests/utils";
+import { randomInt } from "crypto";
+
+interface TestedFields {
+  numberField: number;
+  stringField: string;
+}
+
+class TestedPreferences extends CacheablePreferences<TestedFields> implements WithFields<TestedFields> {
+  readonly defaults: TestedFields;
+  readonly mockedSettingsNamespace: string;
+  readonly mockedStorageArea: ChromeStorageArea;
+  readonly mockedStorageHelper: StorageHelper;
+
+  numberField;
+  stringField;
+
+  constructor(settingsNamespace: string, mockedDefaults: TestedFields) {
+    const mockedStorageArea = new ChromeStorageArea();
+    const mockedStorageHelper = new StorageHelper(mockedStorageArea);
+    const mockedConfigurationController = new ConfigurationController(
+      settingsNamespace,
+      mockedStorageHelper,
+    );
+
+    super(settingsNamespace, mockedConfigurationController);
+
+    this.mockedSettingsNamespace = settingsNamespace;
+    this.mockedStorageArea = mockedStorageArea;
+    this.mockedStorageHelper = mockedStorageHelper;
+    this.defaults = mockedDefaults;
+
+    this.numberField = new PreferenceField(this, {
+      field: 'numberField',
+      defaultValue: this.defaults.numberField,
+    });
+
+    this.stringField = new PreferenceField(this, {
+      field: 'stringField',
+      defaultValue: this.defaults.stringField,
+    });
+  }
+}
+
+describe('CachablePreferences', () => {
+  let preferences: TestedPreferences;
+
+  beforeEach(() => {
+    preferences = new TestedPreferences(randomString(), {
+      numberField: randomInt(-100_000, 100_000),
+      stringField: randomString(),
+    });
+  });
+
+  describe('PreferenceField', () => {
+    it('should get/set values in preferences with defaults in mind', async () => {
+      expect(await preferences.numberField.get()).toBe(preferences.defaults.numberField);
+      expect(await preferences.stringField.get()).toBe(preferences.defaults.stringField);
+
+      const randomUpdatedNumber = randomInt(100_000_000);
+      const randomUpdatedString = randomString();
+
+      await preferences.numberField.set(randomUpdatedNumber);
+      await preferences.stringField.set(randomUpdatedString);
+
+      expect(await preferences.numberField.get()).toBe(randomUpdatedNumber);
+      expect(await preferences.stringField.get()).toBe(randomUpdatedString);
+    });
+  });
+
+  it('should not store anything unless written into', async () => {
+    expect(preferences.mockedStorageArea.mockedData).toEqual({});
+
+    const randomValue = randomInt(10000000);
+    await preferences.numberField.set(randomValue);
+
+    expect(preferences.mockedStorageArea.mockedData).toEqual({
+      [preferences.mockedSettingsNamespace]: {
+        numberField: randomValue,
+      },
+    });
+  });
+
+  it('should read from cache on subsequent reads', async () => {
+    void await preferences.readRaw('numberField', preferences.defaults.numberField);
+    expect(preferences.mockedStorageArea.get).toHaveBeenCalledOnce();
+
+    preferences.mockedStorageArea.get.mockReset();
+
+    void await preferences.readRaw('numberField', preferences.defaults.numberField);
+    expect(preferences.mockedStorageArea.get).not.toHaveBeenCalled();
+  });
+
+  it('should not write if cached value is the same unless forced to', async () => {
+    const firstValue = randomString();
+    const secondValue = randomString();
+
+    void await preferences.writeRaw('stringField', firstValue);
+    expect(preferences.mockedStorageArea.set).toHaveBeenCalledOnce();
+
+    preferences.mockedStorageArea.set.mockReset();
+
+    void await preferences.writeRaw('stringField', firstValue);
+    expect(preferences.mockedStorageArea.set).not.toHaveBeenCalled();
+
+    preferences.mockedStorageArea.set.mockReset();
+
+    void await preferences.writeRaw('stringField', secondValue);
+    expect(preferences.mockedStorageArea.set).toHaveBeenCalledOnce();
+
+    preferences.mockedStorageArea.set.mockReset();
+
+    void await preferences.writeRaw('stringField', secondValue, true);
+    expect(preferences.mockedStorageArea.set).toHaveBeenCalledOnce();
+  });
+
+  it('will avoid writing default value if field was accessed previously', async () => {
+    void await preferences.stringField.get();
+    void await preferences.stringField.set(preferences.defaults.stringField);
+
+    expect(preferences.mockedStorageArea.set).not.toHaveBeenCalled();
+    expect(preferences.mockedStorageArea.mockedData).toEqual({});
+  });
+
+  it('should notify about changes', async () => {
+    const subscriber = vi.fn();
+    preferences.subscribe(subscriber);
+
+    const updatedValue = randomString();
+    await preferences.stringField.set(updatedValue);
+
+    expect(subscriber).toHaveBeenCalledWith({
+      stringField: updatedValue,
+    });
+  });
+
+  it('should stop sending changes when unsubscribed', async () => {
+    const subscriber = vi.fn();
+    const unsubscribe = preferences.subscribe(subscriber);
+
+    const updatedValue = randomString();
+    await preferences.stringField.set(updatedValue);
+
+    expect(subscriber).toHaveBeenCalledOnce();
+
+    subscriber.mockReset();
+    unsubscribe();
+
+    const secondUpdatedValue = randomString();
+    await preferences.stringField.set(secondUpdatedValue);
+
+    expect(subscriber).not.toHaveBeenCalled();
+  });
+
+  it('should dispose of all subscriptions', async () => {
+    const subscriber = vi.fn();
+    preferences.subscribe(subscriber);
+
+    await preferences.stringField.set(randomString());
+    expect(subscriber).toHaveBeenCalledOnce();
+
+    subscriber.mockReset();
+
+    preferences.dispose();
+
+    await preferences.stringField.set(randomString());
+    expect(subscriber).not.toHaveBeenCalled();
+  });
+});