diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 3265fb1ef8b169eda668297a5970bbe6f6c49ed8..e7f5dcf4a1966305e892669718b37b43304467b9 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -120,13 +120,15 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
 	}
 
 	/**
+	 * <strike>
 	 * Allows access to the proxy object. It has to be used instead of <code>this</code> for local calls to public
 	 * methods for caching purposes. This is an ugly but necessary temporary workaround until a better solution is
 	 * implemented (e.g. use of AspectJ's weaving).
 	 * @return the proxy for CouchDBDao
+	 * </strike>
 	 */
 	private @NonNull IDatabaseDao getDatabaseDao() {
-		return (IDatabaseDao) AopContext.currentProxy();
+		return this;
 	}
 
 	@Override