diff --git a/cas-client-support-distributed-ehcache/pom.xml b/cas-client-support-distributed-ehcache/pom.xml
new file mode 100644
index 0000000..d826b00
--- /dev/null
+++ b/cas-client-support-distributed-ehcache/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cas-client</artifactId>
+        <groupId>org.jasig.cas</groupId>
+        <version>3.1.9-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.jasig.cas</groupId>
+    <artifactId>cas-client-support-distributed</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jasig.cas</groupId>
+
+            <artifactId>cas-client-core</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>${ehcache.version}</version>
+            <scope>compile</scope>
+            <type>jar</type>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/cas-client-support-distributed-ehcache/src/main/java/org/jasig/cas/client/proxy/EhcacheBackedProxyGrantingTicketStorageImpl.java b/cas-client-support-distributed-ehcache/src/main/java/org/jasig/cas/client/proxy/EhcacheBackedProxyGrantingTicketStorageImpl.java
new file mode 100644
index 0000000..6adc62d
--- /dev/null
+++ b/cas-client-support-distributed-ehcache/src/main/java/org/jasig/cas/client/proxy/EhcacheBackedProxyGrantingTicketStorageImpl.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2007 The JA-SIG Collaborative. All rights reserved. See license
+ * distributed with this file and available online at
+ * http://www.ja-sig.org/products/cas/overview/license/index.html
+ */
+package org.jasig.cas.client.proxy;
+
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.Element;
+import net.sf.ehcache.CacheManager;
+
+/**
+ * @author Scott Battaglia
+ * @version $Revision$ $Date$
+ * @since 3.1.9
+ */
+public final class EhcacheBackedProxyGrantingTicketStorageImpl implements ProxyGrantingTicketStorage {
+
+    public static final String EHCACHE_CACHE_NAME = "org.jasig.cas.client.proxy.EhcacheBackedProxyGrantingTicketStorageImpl.cache";
+
+    final Cache cache;
+
+    public EhcacheBackedProxyGrantingTicketStorageImpl() {
+        this(CacheManager.create().getCache(EHCACHE_CACHE_NAME));
+
+    }
+
+    public EhcacheBackedProxyGrantingTicketStorageImpl(final Cache cache) {
+        this.cache = cache;
+    }
+
+    public void save(final String proxyGrantingTicketIou, final String proxyGrantingTicket) {
+        final Element element = new Element(proxyGrantingTicketIou, proxyGrantingTicket);
+        this.cache.put(element);
+    }
+
+    public String retrieve(final String proxyGrantingTicketIou) {
+        final Element element = this.cache.get(proxyGrantingTicketIou);
+
+        if (element == null) {
+            return null;
+        }
+
+        return (String) element.getValue();
+    }
+
+    public void cleanUp() {
+        return;
+    }
+}
diff --git a/pom.xml b/pom.xml
index 8fe880a..5716b36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,6 +131,7 @@
         <module>cas-client-integration-atlassian</module>
         <module>cas-client-support-distributed-ehcache</module>
         <module>cas-client-support-distributed-memcached</module>
+        <module>cas-client-support-distributed-ehcache</module>
     </modules>
 
     <properties>