diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 49ba9b22e..2c297433a 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -123,6 +123,10 @@ defmodule Pleroma.User do
     Cachex.get!(:user_cache, key, fallback: fn(_) -> Repo.get_by(User, nickname: nickname) end)
   end
 
+  def get_cached_by_nickname(nickname) do
+    Repo.get_by(User, nickname: nickname)
+  end
+
   def get_cached_user_info(user) do
     key = "user_info:#{user.id}"
     Cachex.get!(:user_cache, key, fallback: fn(_) -> user_info(user) end)
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 13e3baad6..7ceca042b 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -20,7 +20,7 @@ defmodule Pleroma.Web.WebFinger do
     regex = ~r/(acct:)?(?<username>\w+)@#{host}/
     case Regex.named_captures(regex, resource) do
       %{"username" => username} ->
-        user = User.get_cached_by_nickname(username)
+        user = User.get_by_nickname(username)
         {:ok, represent_user(user)}
       _ -> nil
     end