diff --git a/src/main/java/de/thm/arsnova/dao/CacheBustListener.java b/src/main/java/de/thm/arsnova/cache/CacheBustListener.java
similarity index 88%
rename from src/main/java/de/thm/arsnova/dao/CacheBustListener.java
rename to src/main/java/de/thm/arsnova/cache/CacheBustListener.java
index cde9852b38b5cdae9ac3e0fd4528aef0b5edd20d..68520b619b1bbf5e343b71ba092d3a3310ad8f4f 100644
--- a/src/main/java/de/thm/arsnova/dao/CacheBustListener.java
+++ b/src/main/java/de/thm/arsnova/cache/CacheBustListener.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.thm.arsnova.dao;
+package de.thm.arsnova.cache;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
@@ -24,6 +24,11 @@ import org.springframework.stereotype.Component;
 import de.thm.arsnova.events.NovaEvent;
 import de.thm.arsnova.events.NovaEventVisitor;
 
+/**
+ * Listener registration for the cache buster.
+ *
+ * Note that this class is necessary in order for the annotations to work.
+ */
 @Component
 public class CacheBustListener implements ApplicationListener<NovaEvent> {
 
diff --git a/src/main/java/de/thm/arsnova/dao/CacheBuster.java b/src/main/java/de/thm/arsnova/cache/CacheBuster.java
similarity index 99%
rename from src/main/java/de/thm/arsnova/dao/CacheBuster.java
rename to src/main/java/de/thm/arsnova/cache/CacheBuster.java
index f767ca21759a8064b6b2791224015d5d69bf8118..00c9ab4a509e53ad40ddbdfa82ffc7b42d24367a 100644
--- a/src/main/java/de/thm/arsnova/dao/CacheBuster.java
+++ b/src/main/java/de/thm/arsnova/cache/CacheBuster.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.thm.arsnova.dao;
+package de.thm.arsnova.cache;
 
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/de/thm/arsnova/dao/ICacheBuster.java b/src/main/java/de/thm/arsnova/cache/ICacheBuster.java
similarity index 96%
rename from src/main/java/de/thm/arsnova/dao/ICacheBuster.java
rename to src/main/java/de/thm/arsnova/cache/ICacheBuster.java
index f173d2b4806cadfe6efda5905462bafe464c295c..9800991cf30979af2abaad4b316b6d8c471f4e64 100644
--- a/src/main/java/de/thm/arsnova/dao/ICacheBuster.java
+++ b/src/main/java/de/thm/arsnova/cache/ICacheBuster.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.thm.arsnova.dao;
+package de.thm.arsnova.cache;
 
 /**
  * This interface is used as a tag to make Spring dependency injection happy...
diff --git a/src/main/java/de/thm/arsnova/cache/package-info.java b/src/main/java/de/thm/arsnova/cache/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..4bf0879279bedfe80f9c547d1c86450b33ee725d
--- /dev/null
+++ b/src/main/java/de/thm/arsnova/cache/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Classes and interfaces related to caching
+ */
+package de.thm.arsnova.cache;
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/spring/spring-main.xml b/src/main/webapp/WEB-INF/spring/spring-main.xml
index a1c45260551519b355e9d72e5622c729f725fa65..72c2beb317bdb698307f671547a7a5258f53b26a 100644
--- a/src/main/webapp/WEB-INF/spring/spring-main.xml
+++ b/src/main/webapp/WEB-INF/spring/spring-main.xml
@@ -23,7 +23,7 @@
 		<property name="fileEncoding" value="UTF-8" />
 	</bean>
 
-	<context:component-scan base-package="de.thm.arsnova.dao,de.thm.arsnova.events,de.thm.arsnova.security,de.thm.arsnova.services,de.thm.arsnova.config,de.thm.arsnova.domain" />
+	<context:component-scan base-package="de.thm.arsnova.dao,de.thm.arsnova.cache,de.thm.arsnova.events,de.thm.arsnova.security,de.thm.arsnova.services,de.thm.arsnova.config,de.thm.arsnova.domain" />
 
 	<context:annotation-config />