diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a278efe..9f17ef9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,6 +35,11 @@ jobs:
         run: |
           sudo service mysql start
           mysql -h 127.0.0.1 -u root -proot -e 'CREATE DATABASE cakephp;'
+      - name: Setup Geography for PostgreSQL
+        if: matrix.db-type == 'pgsql'
+        run: |
+          sudo apt-get install postgis
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
diff --git a/docs/Behavior/Geocoder.md b/docs/Behavior/Geocoder.md
index e8e3b01..c568fad 100644
--- a/docs/Behavior/Geocoder.md
+++ b/docs/Behavior/Geocoder.md
@@ -166,3 +166,18 @@ You can test the geocoding and also remove cache data where needed.
 
 ## Providers
 Full list of existing providers [here](https://github.com/geocoder-php/Geocoder#providers).
+
+## Spatial
+You can also use the "spatial" finder using coordinates as POINT instead of lat/lng.
+```php
+$query = $this->Addresses->find('spatial', [
+    'lat' => 13.3,
+    'lng' => 19.2,
+    'distance' => 100,
+]);
+```
+Note: This only works with PostGIS and MySQL 5.7+ (and MariaDB 10.4+) databases, as they support spatial data types.
+
+There can be a performance improvement when using spatial indexes, so you might want to consider using this for larger datasets.
+In reality I didnt get the index to work, though. Only managed to limit down the looked up entries from full table scan to range, which
+sped it up, too.
diff --git a/docs/Model/GeocodedAddresses.md b/docs/Model/GeocodedAddresses.md
index 57016f7..2f4e004 100644
--- a/docs/Model/GeocodedAddresses.md
+++ b/docs/Model/GeocodedAddresses.md
@@ -25,7 +25,7 @@ if ($address && $address->lat && $address->lng) {
 }
 ```
 
-Don't forget to add the Type mapping of `Geo\Database\Type\ObjectType` in your bootstrap.php.
+Remember to add the Type mapping of `Geo\Database\Type\ObjectType` in your bootstrap.php.
 ```php
 TypeFactory::map('object', 'Geo\Database\Type\ObjectType');
 ```
diff --git a/src/Controller/Admin/GeocodedAddressesController.php b/src/Controller/Admin/GeocodedAddressesController.php
index d5f3bee..fdc4b83 100644
--- a/src/Controller/Admin/GeocodedAddressesController.php
+++ b/src/Controller/Admin/GeocodedAddressesController.php
@@ -9,7 +9,7 @@
  *
  * @property \Geo\Model\Table\GeocodedAddressesTable $GeocodedAddresses
  *
- * @method \Cake\Datasource\ResultSetInterface<\Geo\Model\Entity\GeocodedAddress> paginate($object = null, array $settings = [])
+ * @method \Cake\Datasource\ResultSetInterface<\Geo\Model\Entity\GeocodedAddress> paginate(\Cake\Datasource\RepositoryInterface|\Cake\Datasource\QueryInterface|string|null $object = null, array $settings = [])
  */
 class GeocodedAddressesController extends AppController {
 
diff --git a/src/Model/Behavior/GeocoderBehavior.php b/src/Model/Behavior/GeocoderBehavior.php
index 5c45d03..0ee98ff 100644
--- a/src/Model/Behavior/GeocoderBehavior.php
+++ b/src/Model/Behavior/GeocoderBehavior.php
@@ -76,6 +76,7 @@ class GeocoderBehavior extends Behavior {
 		'unit' => Calculator::UNIT_KM,
 		'implementedFinders' => [
 			'distance' => 'findDistance',
+			'spatial' => 'findSpatial',
 		],
 		'validationError' => null,
 		'cache' => false, // Enable only if you got a GeocodedAddresses table running
@@ -401,6 +402,60 @@ public function findDistance(SelectQuery $query, ?float $lat = null, ?float $lng
 		return $query;
 	}
 
+	/**
+	 * @param \Cake\ORM\Query\SelectQuery $query
+	 * @param float|null $lat
+	 * @param float|null $lng
+	 * @param \Geocoder\Model\Coordinates|null $coordinates
+	 * @param int|null $distance
+	 * @param string|null $tableName
+	 * @param bool $sort
+	 * @return \Cake\ORM\Query\SelectQuery
+	 */
+	public function findSpatial(SelectQuery $query, ?float $lat = null, ?float $lng = null, ?Coordinates $coordinates = null, ?int $distance = null, ?string $tableName = null, bool $sort = true): SelectQuery {
+		$options = [
+			'tableName' => $tableName,
+			'sort' => $sort,
+			'lat' => $lat,
+			'lng' => $lng,
+			'distance' => $distance,
+			'coordinates' => $coordinates,
+		];
+		$options = $this->assertCoordinates($options);
+
+		if ($query->isAutoFieldsEnabled() === null) {
+			$query->enableAutoFields(true);
+		}
+
+		$lat = $options[static::OPTION_LAT];
+		$lng = $options[static::OPTION_LNG];
+
+		// Add distance calculation as a virtual field
+		$query->select([
+			'distance' => new QueryExpression(
+				"ST_Distance_Sphere(coordinates, ST_GeomFromText('POINT($lng $lat)')) / 1000",
+			),
+		]);
+
+		// Filter by max distance if limit is provided
+		if (isset($options['distance'])) {
+			$distance = (float)$options['distance'];
+			$query->where(function (QueryExpression $exp) use ($lat, $lng, $distance) {
+				return $exp->lte(
+					new QueryExpression("ST_Distance_Sphere(coordinates, ST_GeomFromText('POINT($lng $lat)')) / 1000"),
+					$distance,
+				);
+			});
+		}
+
+		if ($options['sort']) {
+			$sort = $options['sort'] === true ? 'ASC' : $options['sort'];
+			$query->orderBy(['distance' => $sort]);
+		}
+
+		return $query;
+	}
+
 	/**
 	 * Forms a sql snippet for distance calculation on db level using two lat/lng points.
 	 *
@@ -653,6 +708,10 @@ protected function assertCoordinates(array $options): array {
 			throw new InvalidArgumentException($error);
 		}
 
+		if ($options[static::OPTION_LAT] < -90 || $options[static::OPTION_LAT] > 90 || $options[static::OPTION_LNG] < -180 || $options[static::OPTION_LNG] > 180) {
+			throw new InvalidArgumentException('Invalid latitude or longitude in (' . $options[static::OPTION_LAT] . '/' . $options[static::OPTION_LNG] . ').');
+		}
+
 		return $options;
 	}
 
diff --git a/templates/Admin/GeocodedAddresses/index.php b/templates/Admin/GeocodedAddresses/index.php
index 61e38bd..23cdfbc 100644
--- a/templates/Admin/GeocodedAddresses/index.php
+++ b/templates/Admin/GeocodedAddresses/index.php
@@ -1,10 +1,13 @@
 <?php
+
 /**
  * @var \App\View\AppView $this
- * @var \Geo\Model\Entity\GeocodedAddress[]|\Cake\Collection\CollectionInterface $geocodedAddresses
+ * @var iterable<\Geo\Model\Entity\GeocodedAddress> $geocodedAddresses
  */
+use Cake\Core\Plugin;
+
+?>
 
-use Cake\Core\Plugin; ?>
 <nav class="actions large-3 medium-4 columns col-sm-4 col-xs-12" id="actions-sidebar">
     <ul class="side-nav nav nav-pills nav-stacked">
         <li class="heading"><?= __('Actions') ?></li>
diff --git a/tests/Fixture/SpatialAddressesFixture.php b/tests/Fixture/SpatialAddressesFixture.php
new file mode 100644
index 0000000..b1bb6bc
--- /dev/null
+++ b/tests/Fixture/SpatialAddressesFixture.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Geo\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+class SpatialAddressesFixture extends TestFixture {
+
+	/**
+	 * Fields
+	 *
+	 * @var array
+	 */
+	public array $fields = [
+		'id' => ['type' => 'integer'],
+		'address' => ['type' => 'string', 'null' => false, 'default' => '', 'length' => 190, 'comment' => 'street address and street numbe'],
+		'lat' => ['type' => 'float', 'null' => false, 'default' => null, 'comment' => 'maps.google.de latitude'],
+		'lng' => ['type' => 'float', 'null' => false, 'default' => null, 'comment' => 'maps.google.de longitude'],
+		'coordinates' => ['type' => 'point', 'null' => false],
+		'created' => ['type' => 'datetime', 'null' => true, 'default' => null],
+		'modified' => ['type' => 'datetime', 'null' => true, 'default' => null],
+		'_constraints' => [
+			'primary' => ['type' => 'primary', 'columns' => ['id']],
+		],
+		'_indexes' => [
+			//'coordinates_spatial' => ['type' => 'spatial', 'columns' => ['coordinates'], 'length' => []],
+		],
+	];
+
+	/**
+	 * Records
+	 *
+	 * @var array
+	 */
+	public array $records = [
+	];
+
+}
diff --git a/tests/TestApp/src/Model/Table/SpatialAddressesTable.php b/tests/TestApp/src/Model/Table/SpatialAddressesTable.php
new file mode 100644
index 0000000..1969fcb
--- /dev/null
+++ b/tests/TestApp/src/Model/Table/SpatialAddressesTable.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace TestApp\Model\Table;
+
+use ArrayObject;
+use Cake\Datasource\EntityInterface;
+use Cake\Event\EventInterface;
+use Cake\ORM\Query\SelectQuery;
+use Cake\ORM\Table;
+
+/**
+ * SpatialAddresses Model
+ *
+ * @method \TestApp\Model\Entity\SpatialAddress get(mixed $primaryKey, array|string $finder = 'all', \Psr\SimpleCache\CacheInterface|string|null $cache = null, \Closure|string|null $cacheKey = null, mixed ...$args)
+ * @method \TestApp\Model\Entity\SpatialAddress newEntity(array $data, array $options = [])
+ * @method array<\TestApp\Model\Entity\SpatialAddress> newEntities(array $data, array $options = [])
+ * @method \TestApp\Model\Entity\SpatialAddress|false save(\Cake\Datasource\EntityInterface $entity, array $options = [])
+ * @method \TestApp\Model\Entity\SpatialAddress patchEntity(\Cake\Datasource\EntityInterface $entity, array $data, array $options = [])
+ * @method array<\TestApp\Model\Entity\SpatialAddress> patchEntities(iterable $entities, array $data, array $options = [])
+ * @method \TestApp\Model\Entity\SpatialAddress findOrCreate($search, ?callable $callback = null, array $options = [])
+ * @method \TestApp\Model\Entity\SpatialAddress saveOrFail(\Cake\Datasource\EntityInterface $entity, array $options = [])
+ * @method \Cake\Datasource\ResultSetInterface<\TestApp\Model\Entity\SpatialAddress>|false saveMany(iterable $entities, array $options = [])
+ * @mixin \Cake\ORM\Behavior\TimestampBehavior
+ * @method \TestApp\Model\Entity\SpatialAddress newEmptyEntity()
+ * @method \Cake\Datasource\ResultSetInterface<\TestApp\Model\Entity\SpatialAddress> saveManyOrFail(iterable $entities, array $options = [])
+ * @method \Cake\Datasource\ResultSetInterface<\TestApp\Model\Entity\SpatialAddress>|false deleteMany(iterable $entities, array $options = [])
+ * @method \Cake\Datasource\ResultSetInterface<\TestApp\Model\Entity\SpatialAddress> deleteManyOrFail(iterable $entities, array $options = [])
+ */
+class SpatialAddressesTable extends Table {
+
+	/**
+	 * @var \Geo\Geocoder\Geocoder
+	 */
+	protected $_Geocoder;
+
+	/**
+	 * Initialize method
+	 *
+	 * @param array<string, mixed> $config The configuration for the Table.
+	 * @return void
+	 */
+	public function initialize(array $config): void {
+		parent::initialize($config);
+
+		$this->setTable('spatial_addresses');
+		$this->setDisplayField('address');
+		$this->setPrimaryKey('id');
+
+		//$this->getSchema()->setColumnType('coordinates', 'point');
+
+		$this->addBehavior('Timestamp');
+	}
+
+	/**
+	 * Add formatter aka afterFind parsing geospatial values
+	 *
+	 * @param \Cake\Event\EventInterface $event
+	 * @param \Cake\ORM\Query\SelectQuery $query
+	 * @param \ArrayObject $options
+	 * @return void
+	 */
+	public function beforeFind(EventInterface $event, SelectQuery $query, ArrayObject $options): void {
+		$columns = ['coordinates' => 'point'];
+
+		// Go through each result and unpack() the binary data
+		$query->formatResults(function($results) use($columns) {
+			return $results->map(function($entity) use($columns) {
+				foreach ($columns as $column => $type) {
+					if (!isset($entity->{$column})) {
+						continue;
+					}
+					// [TypeError] unpack(): Argument #2 ($string) must be of type string
+					if (!is_string($entity->{$column})) {
+						continue;
+					}
+					switch ($type) {
+						// TODO support other types, not only POINT
+						case 'point':
+							$entity->{$column} = unpack('x/x/x/x/corder/Ltype/dx/dy', $entity->{$column});
+
+							break;
+					}
+				}
+
+				return $entity;
+			});
+		});
+	}
+
+	/**
+	 * Once entity is marshalled, prepare geospatial values to be saved into database
+	 *
+	 * @param \Cake\Event\EventInterface $event
+	 * @param \Cake\Datasource\EntityInterface $entity
+	 * @param \ArrayObject $data
+	 * @param \ArrayObject $options
+	 * @return void
+	 */
+	public function afterMarshal(EventInterface $event, EntityInterface $entity, ArrayObject $data, ArrayObject $options): void {
+		$columns = ['coordinates' => 'point'];
+
+		foreach ($columns as $column => $type) {
+			// Skip if the column is not present in $data
+			if (!isset($data[$column])) {
+				if (!empty($data['lat']) && !empty($data['lng'])) {
+					$data[$column] = [$data['lng'], $data['lat']]; // lng, lat order is important!
+				} else {
+					continue;
+				}
+			}
+
+			// We expect an array like [12, 34] otherwise skip
+			if (!is_array($data[$column])) {
+				continue;
+			}
+			switch ($type) {
+				// TODO support other types, not only POINT
+				case 'point':
+					$value = sprintf('\'%s(%s)\'', strtoupper($type), implode(' ', $data[$column]));
+
+					break;
+			}
+			// Set $value on $entity using ST_GeomFromText()
+			$entity->{$column} = $this->query()->func()->ST_GeomFromText([
+				$value => 'literal',
+			]);
+		}
+	}
+
+}
diff --git a/tests/TestCase/Model/Table/SpatialAddressesTableTest.php b/tests/TestCase/Model/Table/SpatialAddressesTableTest.php
new file mode 100644
index 0000000..f18a022
--- /dev/null
+++ b/tests/TestCase/Model/Table/SpatialAddressesTableTest.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace Geo\Test\TestCase\Model\Table;
+
+use Cake\Database\Driver\Mysql;
+use Cake\Datasource\ConnectionManager;
+use Cake\ORM\TableRegistry;
+use Cake\TestSuite\TestCase;
+use Cake\Utility\Hash;
+
+class SpatialAddressesTableTest extends TestCase {
+
+	/**
+	 * Fixtures
+	 *
+	 * @var array
+	 */
+	protected array $fixtures = [
+		'plugin.Geo.SpatialAddresses',
+	];
+
+	/**
+	 * @var \TestApp\Model\Table\SpatialAddressesTable
+	 */
+	protected $SpatialAddresses;
+
+	/**
+	 * @return void
+	 */
+	public function setUp(): void {
+		$db = ConnectionManager::get('test');
+		$driver = $db->getDriver();
+		$this->skipIf(!($driver instanceof Mysql), 'The functionality/test is only compatible with Mysql right now.');
+
+		parent::setUp();
+
+		$config = TableRegistry::getTableLocator()->exists('SpatialAddresses') ? [] : ['className' => 'TestApp\Model\Table\SpatialAddressesTable'];
+		$this->SpatialAddresses = TableRegistry::getTableLocator()->get('SpatialAddresses', $config);
+
+		$entries = [
+			[
+				'address' => 'Langstrasse 10, 101010 München',
+				'lat' => '48.150589',
+				'lng' => '11.472230',
+				'created' => '2011-04-21 16:50:05',
+				'modified' => '2011-10-07 17:42:27',
+			],
+			[
+				'address' => 'Leckermannstrasse 10, 10101 München',
+				'lat' => '48.133942',
+				'lng' => '11.490000',
+				'created' => '2011-04-21 16:51:01',
+				'modified' => '2011-10-07 17:44:02',
+			],
+			[
+				'address' => 'Krebenweg 11, 12523 Schwäbisch Hall',
+				'lat' => '19.081490',
+				'lng' => '19.690800',
+				'created' => '2011-11-17 13:47:36',
+				'modified' => '2011-11-17 13:47:36',
+			],
+			[
+				'address' => 'hjsf',
+				'lat' => '52.52',
+				'lng' => '13.40',
+				'created' => '2011-11-17 14:34:14',
+				'modified' => '2011-11-17 14:49:21',
+			],
+		];
+		foreach ($entries as $entry) {
+			$entity = $this->SpatialAddresses->newEntity($entry);
+			$this->SpatialAddresses->saveOrFail($entity);
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	public function tearDown(): void {
+		unset($this->SpatialAddresses);
+
+		parent::tearDown();
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testSave() {
+		$address = $this->SpatialAddresses->newEntity([
+			'address' => 'Berlin',
+			'lat' => 12,
+			'lng' => 11,
+		]);
+		$address = $this->SpatialAddresses->save($address);
+		$this->assertNotEmpty($address);
+
+		$address = $this->SpatialAddresses->get($address->id);
+		$this->assertNotEmpty($address->coordinates);
+		$this->assertEquals(11, $address->coordinates['x']);
+		$this->assertEquals(12, $address->coordinates['y']);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testFindSpatial() {
+		$this->SpatialAddresses->addBehavior('Geo.Geocoder');
+		$addresses = $this->SpatialAddresses->find('spatial', ...[
+			'lat' => 48.110589,
+			'lng' => 11.422230,
+			'distance' => 100,
+		])
+			->all()
+			->toArray();
+
+		$distances = Hash::extract($addresses, '{n}.distance');
+		$expected = [
+			5.66,
+			5.79,
+		];
+		foreach ($distances as $key => $distance) {
+			$this->assertSame($expected[$key], round($distance, 2));
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testFindSpatialExplain() {
+		$this->assertNotEmpty($this->SpatialAddresses->getSchema()->getIndex('coordinates_spatial'));
+
+		$this->SpatialAddresses->addBehavior('Geo.Geocoder');
+
+		$sql = <<<SQL
+EXPLAIN SELECT (ST_Distance_Sphere(coordinates, ST_GeomFromText('POINT(11.42223 48.110589)')) / 1000) AS `distance`, `SpatialAddresses`.`id` AS `SpatialAddresses__id`, `SpatialAddresses`.`address` AS `SpatialAddresses__address`, `SpatialAddresses`.`lat` AS `SpatialAddresses__lat`, `SpatialAddresses`.`lng` AS `SpatialAddresses__lng`, `SpatialAddresses`.`coordinates` AS `SpatialAddresses__coordinates`, `SpatialAddresses`.`created` AS `SpatialAddresses__created`, `SpatialAddresses`.`modified` AS `SpatialAddresses__modified` FROM `spatial_addresses` `SpatialAddresses` WHERE (ST_Distance_Sphere(coordinates, ST_GeomFromText('POINT(11.42223 48.110589)')) / 1000) <= 100 ORDER BY `distance` ASC
+SQL;
+		$result = $this->SpatialAddresses->getConnection()->execute($sql)->fetchAssoc();
+
+		// Should be type range or index, not ALL
+		debug($result);
+	}
+
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 6dd7db3..dd0a175 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -103,7 +103,20 @@ class_alias(View::class, 'App\View\AppView');
 	'apiKey' => env('API_KEY'), // local, set through `export API_KEY=".."` in CLI
 ]);
 
+/**
+ * @var \Cake\Database\Connection $db
+ */
+$db = ConnectionManager::get('test');
+if ($db->getDriver() instanceof \Cake\Database\Driver\Postgres) {
+	//$db->execute('CREATE EXTENSION postgis;')->fetchAll();
+	//debug($db->execute('SELECT postgis_full_version();')->fetchAssoc());
+}
+
 if (env('FIXTURE_SCHEMA_METADATA')) {
 	$loader = new SchemaLoader();
 	$loader->loadInternalFile(env('FIXTURE_SCHEMA_METADATA'));
 }
+
+if ($db->getDriver() instanceof \Cake\Database\Driver\Mysql) {
+	$db->execute('ALTER TABLE spatial_addresses ADD SPATIAL INDEX coordinates_spatial(coordinates);');
+}
diff --git a/tests/schema.php b/tests/schema.php
index ec9d4f8..0416cdc 100644
--- a/tests/schema.php
+++ b/tests/schema.php
@@ -33,6 +33,10 @@
 		'indexes' => $indexes,
 	];
 	$tables[$tableName] = $table;
+
+	if (str_contains(getenv('DB_URL'), 'postgres')) {
+		unset($tables['spatial_addresses']);
+	}
 }
 
 return $tables;