diff --git a/README.md b/README.md
index b51ffa87..476057ca 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ void main() {
 
   bot.onMessageReceived.listen((event) {
     if (event.message.content == "!ping") {
-      (event.message.channel.getOrDownload() as TextChannel).sendMessage(content: "Pong!");
+      event.message.channel.getFromCache()?.sendMessage(content: "Pong!");
     }
   });
 }
diff --git a/nyxx.commander/README.md b/nyxx.commander/README.md
index c43e6c79..0d8324fe 100644
--- a/nyxx.commander/README.md
+++ b/nyxx.commander/README.md
@@ -33,7 +33,7 @@ void main() {
 
   bot.onMessageReceived.listen((event) {
     if (event.message.content == "!ping") {
-      (event.message.channel.getOrDownload() as TextChannel).sendMessage(content: "Pong!");
+      event.message.channel.getFromCache()?.sendMessage(content: "Pong!");
     }
   });
 }
diff --git a/nyxx.extensions/README.md b/nyxx.extensions/README.md
index ea5203f4..212c09f4 100644
--- a/nyxx.extensions/README.md
+++ b/nyxx.extensions/README.md
@@ -33,7 +33,7 @@ void main() {
 
   bot.onMessageReceived.listen((event) {
     if (event.message.content == "!ping") {
-      (event.message.channel.getOrDownload() as TextChannel).sendMessage(content: "Pong!");
+      event.message.channel.getFromCache()?.sendMessage(content: "Pong!");
     }
   });
 }
diff --git a/nyxx.interactions/README.md b/nyxx.interactions/README.md
index 7407cb25..a6d02652 100644
--- a/nyxx.interactions/README.md
+++ b/nyxx.interactions/README.md
@@ -33,7 +33,7 @@ void main() {
 
   bot.onMessageReceived.listen((event) {
     if (event.message.content == "!ping") {
-      (event.message.channel.getOrDownload() as TextChannel).sendMessage(content: "Pong!");
+      event.message.channel.getFromCache()?.sendMessage(content: "Pong!");
     }
   });
 }
diff --git a/nyxx/README.md b/nyxx/README.md
index c3118648..5ef2392a 100644
--- a/nyxx/README.md
+++ b/nyxx/README.md
@@ -33,7 +33,7 @@ void main() {
 
   bot.onMessageReceived.listen((event) {
     if (event.message.content == "!ping") {
-      (event.message.channel.getOrDownload() as TextChannel).sendMessage(content: "Pong!");
+      event.message.channel.getFromCache()?.sendMessage(content: "Pong!");
     }
   });
 }
diff --git a/nyxx/lib/src/internal/shard/Shard.dart b/nyxx/lib/src/internal/shard/Shard.dart
index 0a7aa3b4..e5ee26bc 100644
--- a/nyxx/lib/src/internal/shard/Shard.dart
+++ b/nyxx/lib/src/internal/shard/Shard.dart
@@ -139,18 +139,15 @@ class Shard implements Disposable {
       case 4004:
       case 4010:
         exit(1);
-        break;
       case 4013:
         manager._logger.shout("Cannot connect to gateway due intent value is invalid. "
             "Check https://discordapp.com/developers/docs/topics/gateway#gateway-intents for more info.");
         exit(1);
-        break;
       case 4014:
         manager._logger.shout("You sent a disallowed intent for a Gateway Intent. "
             "You may have tried to specify an intent that you have not enabled or are not whitelisted for. "
             "Check https://discordapp.com/developers/docs/topics/gateway#gateway-intents for more info.");
         exit(1);
-        break;
       case 4007:
       case 4009:
         _reconnect();