diff --git a/phpBB/includes/auth/oauth/token_storage.php b/phpBB/includes/auth/oauth/token_storage.php
new file mode 100644
index 0000000000..2d3c58d25a
--- /dev/null
+++ b/phpBB/includes/auth/oauth/token_storage.php
@@ -0,0 +1,94 @@
+<?php
+/**
+*
+* @package auth
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Token\TokenInterface;
+
+/**
+* OAuth storage wrapper for phpbb's cache
+*
+* @package auth
+*/
+class phpbb_auth_oauth_token_storage implements TokenStorageInterface
+{
+	/**
+	* Cache driver.
+	*
+	* @var phpbb_cache_driver_interface
+	*/
+	protected $driver;
+
+	/**
+	* @var object|TokenInterface
+	*/
+	protected $cachedToken;
+
+	/**
+	* Creates token storage for phpBB.
+	*
+	* @param phpbb_cache_driver_interface $driver The cache driver
+	*/
+	public function __construct(phpbb_cache_driver_interface $driver)
+	{
+		$this->driver = $driver;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function retrieveAccessToken()
+	{
+		if( $this->cachedToken instanceOf TokenInterface ) {
+			return $this->token;
+		}
+
+		// TODO: check to see if the token is cached
+
+		throw new TokenNotFoundException('Token not stored');
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function storeAccessToken(TokenInterface $token)
+	{
+		$this->cachedToken = $token;
+		// TODO: actually store the token
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function hasAccessToken()
+	{
+		if( $this->cachedToken ) {
+            return true;
+        }
+
+        // TODO: check cache for token
+        return false;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function clearToken()
+	{
+		$this->cachedToken = null;
+		// TODO: clear cache of the token
+	}
+}