diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 948ea04..7de7c9d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -132,7 +132,7 @@ jobs:
         run: tar -xvf /tmp/github-actions/build.tar ./
 
       - name: PHP Mess Detector
-        uses: php-actions/phpmd@v1
+        uses: php-actions/phpmd@v2
         with:
           php_version: ${{ matrix.php }}
           path: src/
diff --git a/src/Flash.php b/src/Flash.php
new file mode 100644
index 0000000..2ee0bb7
--- /dev/null
+++ b/src/Flash.php
@@ -0,0 +1,32 @@
+<?php
+namespace Gt\Session;
+
+use RuntimeException;
+use SplQueue;
+
+class Flash {
+	public function __construct(private readonly SessionStore $session) {}
+
+	public function put(string $name, string $message):void {
+		$queue = $this->session->get("queue.$name");
+		if(!$queue) {
+			$queue = new SplQueue();
+			$this->session->set("queue.$name", $queue);
+		}
+
+		$queue->enqueue(new FlashMessage($name, $message));
+	}
+
+	public function consume(string $name):?FlashMessage {
+		/** @var null|SplQueue $queue */
+		$queue = $this->session->get("queue.$name");
+		try {
+			return $queue->dequeue();
+		}
+		catch(RuntimeException $e) {
+			$this->session->remove("queue.$name");
+			return null;
+		}
+	}
+
+}
diff --git a/src/FlashMessage.php b/src/FlashMessage.php
new file mode 100644
index 0000000..7475eff
--- /dev/null
+++ b/src/FlashMessage.php
@@ -0,0 +1,9 @@
+<?php
+namespace Gt\Session;
+
+class FlashMessage {
+	public function __construct(
+		public readonly string $name,
+		public readonly string $message,
+	) {}
+}
diff --git a/src/SessionStore.php b/src/SessionStore.php
index 07b9788..e934303 100644
--- a/src/SessionStore.php
+++ b/src/SessionStore.php
@@ -38,7 +38,11 @@ public function setData(string $key, mixed $value):void {
 	}
 
 	public function getData(string $key):mixed {
-		return $this->offsetGet($key) ?? null;
+		if(!$this->offsetExists($key)) {
+			return null;
+		}
+
+		return $this->offsetGet($key);
 	}
 
 	public function containsData(string $key):bool {
diff --git a/test/FlashTest.php b/test/FlashTest.php
new file mode 100644
index 0000000..8056d6d
--- /dev/null
+++ b/test/FlashTest.php
@@ -0,0 +1,69 @@
+<?php
+
+use Gt\Session\Flash;
+use Gt\Session\FlashMessage;
+use Gt\Session\SessionStore;
+use PHPUnit\Framework\TestCase;
+
+class FlashTest extends TestCase {
+	public function testPut():void {
+		$sessionStore = self::createMock(SessionStore::class);
+		$sessionStore->expects(self::once())
+			->method("get")
+			->with("queue.test")
+			->willReturn(null);
+		$sessionStore->expects(self::once())
+			->method("set")
+			->with(
+				self::equalTo("queue.test"),
+				self::isInstanceOf(SplQueue::class)
+			);
+
+		$sut = new Flash($sessionStore);
+		$sut->put("test", "Test message");
+	}
+
+	public function testConsume_none():void {
+		$queue = self::createMock(SplQueue::class);
+		$queue->expects(self::once())
+			->method("dequeue")
+			->willThrowException(new RuntimeException("Can't shift from an empty datastructure"));
+		$sessionStore = self::createMock(SessionStore::class);
+		$sessionStore->expects(self::once())
+			->method("get")
+			->with("queue.test")
+			->willReturn($queue);
+		$sut = new Flash($sessionStore);
+		$flashMessage = $sut->consume("test");
+		self::assertNull($flashMessage);
+	}
+
+	public function testConsume():void {
+		$fm1 = new FlashMessage("test", "First");
+		$fm2 = new FlashMessage("test", "Second");
+
+		$queue = self::createMock(SplQueue::class);
+		$queue->expects(self::exactly(3))
+			->method("dequeue")
+			->willReturnOnConsecutiveCalls($fm1, $fm2);
+
+		$sessionStore = self::createMock(SessionStore::class);
+		$sessionStore->expects(self::exactly(3))
+			->method("get")
+			->with("queue.test")
+			->willReturn($queue);
+		$sessionStore->expects(self::once())
+			->method("remove")
+			->with("queue.test");
+		$sut = new Flash($sessionStore);
+
+		$flashMessage = $sut->consume("test");
+		self::assertInstanceOf(FlashMessage::class, $flashMessage);
+		self::assertSame("First", $flashMessage->message);
+		$flashMessage = $sut->consume("test");
+		self::assertInstanceOf(FlashMessage::class, $flashMessage);
+		self::assertSame("Second", $flashMessage->message);
+		$flashMessage = $sut->consume("test");
+		self::assertNull($flashMessage);
+	}
+}