diff --git a/templates/tibiacom/boxes/highscores.php b/templates/tibiacom/boxes/highscores.php
index a2f371fa..4b347da9 100644
--- a/templates/tibiacom/boxes/highscores.php
+++ b/templates/tibiacom/boxes/highscores.php
@@ -1,15 +1,13 @@
 <?php
-
-$topPlayers = getTopPlayers(5);
-foreach($topPlayers as &$player) {
-	$outfit_url = '';
-	if (setting('core.online_outfit')) {
-		$outfit_url = setting('core.outfit_images_url') . '?id=' . $player['looktype']	. (!empty
-			($player['lookaddons']) ? '&addons=' . $player['lookaddons'] : '') . '&head=' . $player['lookhead'] . '&body=' . $player['lookbody'] . '&legs=' . $player['looklegs'] . '&feet=' . $player['lookfeet'];
-
-		$player['outfit'] = $outfit_url;
+$topPlayers = Cache::remember('tibiacom_highscores_top_players', 10 * 60, function() {
+	$topPlayers = getTopPlayers(5);
+	foreach($topPlayers as &$player) {
+		$player['outfit'] = $player['outfit_url'];
+		$player['link'] = getPlayerLink($player['id'], false);
 	}
-}
+
+	return $topPlayers;
+});
 
 $twig->display('highscores.html.twig', array(
 	'topPlayers' => $topPlayers
diff --git a/templates/tibiacom/boxes/templates/highscores.html.twig b/templates/tibiacom/boxes/templates/highscores.html.twig
index c1f8f1d6..bc20a135 100644
--- a/templates/tibiacom/boxes/templates/highscores.html.twig
+++ b/templates/tibiacom/boxes/templates/highscores.html.twig
@@ -44,7 +44,7 @@
 <div id="Topbar" class="Themebox" style="background-image:url({{ template_path }}/images/themeboxes/highscores/highscores.png);">
 	<div class="top_level" style="background:url({{ template_path }}/images/themeboxes/bg_top.png)" align="	">
     {% for player in topPlayers %}
-	    <div style="text-align:left"><a href="{{ getPlayerLink(player['name'], false) }} " class="topfont {% if player['online'] %}online{% else %}offline{% endif %}">
+	    <div style="text-align:left"><a href="{{ player['link'] }} " class="topfont {% if player['online'] %}online{% else %}offline{% endif %}">
 			{% if setting('core.online_outfit') %}
 				<img style="position:absolute;margin-top:-45px;margin-left:-25px;" src="{{ player.outfit }}" alt="player outfit"/>
 			{% endif %}