diff --git a/src/main/scala/service/RequestCache.scala b/src/main/scala/service/RequestCache.scala
index 758c373..059e91c 100644
--- a/src/main/scala/service/RequestCache.scala
+++ b/src/main/scala/service/RequestCache.scala
@@ -22,5 +22,10 @@
     }
   }
 
+  def getAccountByMailAddress(mailAddress: String)(implicit context: app.Context): Option[Account] = {
+    context.cache(s"account.${mailAddress}"){
+      new AccountService {}.getAccountByMailAddress(mailAddress)
+    }
+  }
 }
 
diff --git a/src/main/scala/view/helpers.scala b/src/main/scala/view/helpers.scala
index b2648a0..b53f227 100644
--- a/src/main/scala/view/helpers.scala
+++ b/src/main/scala/view/helpers.scala
@@ -3,7 +3,6 @@
 import java.text.SimpleDateFormat
 import twirl.api.Html
 import util.StringUtil
-import service.AccountService
 import service.RequestCache
 
 /**
@@ -83,11 +82,11 @@
   def assets(implicit context: app.Context): String =
     s"${context.path}/assets"
 
+  /**
+   * Generates the link to the account page.
+   */
   def user(userName: String, mailAddress: String, styleClass: String = "")(implicit context: app.Context): Html = {
-    val account = context.cache(s"account.${mailAddress}"){
-      new AccountService {}.getAccountByMailAddress(mailAddress)
-    }
-    account.map { account =>
+    getAccountByMailAddress(mailAddress).map { account =>
       Html(s"""<a href="${url(account.userName)}" class="${styleClass}">${userName}</a>""")
     } getOrElse Html(userName)
   }