diff --git a/html/user/top_users.php b/html/user/top_users.php
index 06e601b9f6..ab08499b16 100644
--- a/html/user/top_users.php
+++ b/html/user/top_users.php
@@ -2,44 +2,63 @@
 
 require_once("../inc/cache.inc");
 require_once("../inc/util.inc");
+require_once("../inc/user.inc");
+require_once("../inc/translation.inc");
 
-$n = 20;
+define (ITEMS_PER_PAGE, 20);
+define (ITEM_LIMIT,10000);
+
+function get_top_participants($offset,$sort_by){ //Possibly move this to db.inc at some point...
+    db_init();
+    if ($sort_by == "total_credit") {
+	$sort_order = "total_credit desc";
+    } else {
+        $sort_order = "expavg_credit desc";
+    }
+    $res=mysql_query("select * from user order by $sort_order limit $offset,".ITEMS_PER_PAGE);
+    while ($arr[]=mysql_fetch_object($res)){};
+    return $arr;
+}
+
+function participants_to_store($participants){ //These converter functions are here in case we later decide to use something else than serializing to save temp data
+    return serialize($participants);
+}
+function store_to_participants($data){
+    return unserialize($data);
+}
 
 if (isset($_GET["sort_by"])) {
     $sort_by = $_GET["sort_by"];
 } else {
     $sort_by = "expavg_credit";
 }
+
 $offset = get_int("offset", true);
 if (!$offset) $offset=0;
-
 if ($offset % $n) $offset = 0;
 
-if ($offset < 1000) {
+if ($offset < ITEM_LIMIT) {
     $cache_args = "sort_by=$sort_by&offset=$offset";
-    start_cache(TOP_PAGES_TTL, $cache_args);
+    $cacheddata=get_cached_data(10,$cache_args);
+    if ($cacheddata){ //If we have got the data in cache
+	$data = store_to_participants($cacheddata); // use the cached data
+    } else { //if not do queries etc to generate new data
+	require_once("../inc/db.inc");
+	require_once("../inc/user.inc");
+	$data = get_top_participants($offset,$sort_by);
+	set_cache_data(participants_to_store($data),$cache_args); //save data in cache
+    };
 } else {
-    page_head("Limit exceeded");
-    echo "Sorry - first 1000 only.";
-    page_tail();
-    exit();
+    error_page("Limit exceeded - Sorry, first ".ITEM_LIMIT." items only");
 }
 
-require_once("../inc/db.inc");
-require_once("../inc/user.inc");
 
-db_init();
-page_head("Top participants");
-if ($sort_by == "total_credit") {
-    $sort_order = "total_credit desc";
-} else {
-    $sort_order = "expavg_credit desc";
-}
-
-$result = mysql_query("select * from user order by $sort_order limit $offset,$n");
+//Now display what we've got (either gotten from cache or from DB)
+page_head(tr(TOP_PARTICIPANT_TITLE));
 user_table_start($sort_by);
 $i = 1 + $offset;
-while ($user = mysql_fetch_object($result)) {
+$o = 0;
+while ($user = $data[$o]) {
     if ($sort_by == "total_credit") {
         show_user_row($user, $i);
         $i++;
@@ -49,22 +68,18 @@ while ($user = mysql_fetch_object($result)) {
             $i++;
         }
     }
+    $o++;
 }
 echo "</table>\n";
-
 if ($offset > 0) {
-    $new_offset = $offset - $n;
-    echo "<a href=top_users.php?sort_by=$sort_by&offset=$new_offset>Previous $n</a> | ";
+    $new_offset = $offset - ITEMS_PER_PAGE;
+    echo "<a href=top_users.php?sort_by=$sort_by&offset=$new_offset>Previous ".ITEMS_PER_PAGE."</a> | ";
 
 }
-$new_offset = $offset + $n;
-echo "<a href=top_users.php?sort_by=$sort_by&offset=$new_offset>Next $n</a>";
+$new_offset = $offset + ITEMS_PER_PAGE;
+echo "<a href=top_users.php?sort_by=$sort_by&offset=$new_offset>Next ".ITEMS_PER_PAGE."</a>";
+
+page_tail();
 
-if ($offset < 1000) {
-    page_tail(true);
-    end_cache(TOP_PAGES_TTL,$cache_args);
-} else {
-    page_tail();
-}
 
 ?>