diff --git a/src/Util/Cache.js b/src/Util/Cache.js
index 4d89ef284..7fab1bece 100644
--- a/src/Util/Cache.js
+++ b/src/Util/Cache.js
@@ -3,8 +3,8 @@
 export default class Cache extends Array {
 	constructor(discrim, limit) {
 		super();
-		this.discrim = discrim || "id";
-		this.discrimCache = {};
+		this["discrim"] = discrim || "id";
+		this["discrimCache"] = {};
 	}
 
 	get(key, value) {
@@ -51,7 +51,7 @@ export default class Cache extends Array {
 		if (item) {
 			var index = this.indexOf(item);
 			this[index] = data;
-			this.discrimCache[data[this.discrim]] = data;
+			this.discrimCache[data[this.discrim]] = this[index];
 			return this[index];
 		} else {
 			return false;
diff --git a/test/msgbot.js b/test/msgbot.js
index 0e1694405..7cc66e01f 100644
--- a/test/msgbot.js
+++ b/test/msgbot.js
@@ -7,7 +7,11 @@ var request = require("superagent");
 
 client.on("ready", () => {
 	console.log("ready");
-
+	for (var server of client.servers) {
+		if (!(server instanceof Discord.Server)) {
+			console.log("FOUNDED");
+		}
+	}
 	setTimeout(() => {
 		if(client.internal.websocket)
 			client.internal.websocket.close();