Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java

src/main/java/me/clip/placeholderapi/expansion/manager/CloudExpansionManager.java

@@ -204,7 +204,10 @@ public final class CloudExpansionManager
 				return;
 			}
 
-			this.cache.putAll(expansions);
+			for (final CloudExpansion expansion : expansions.values())
+			{
+				this.cache.put(toIndexName(expansion), expansion);
+			}
 		});
 	}