Remove ICachedEntity

src/Discord.Net/Entities/Entity.cs

@@ -6,7 +6,7 @@
 
         public abstract DiscordClient Discord { get; }
 
-        public bool IsAttached => this is ICachedEntity<T>;
+        bool IEntity<T>.IsAttached => false;
 
         public Entity(T id)
         {

src/Discord.Net/Entities/WebSocket/CachedDMChannel.cs

@@ -8,6 +8,8 @@ namespace Discord
 {
     internal class CachedDMChannel : DMChannel, IDMChannel, ICachedChannel, ICachedMessageChannel, ICachedPrivateChannel
     {
+        bool IEntity<ulong>.IsAttached => true;
+
         private readonly MessageManager _messages;
 
         public new DiscordSocketClient Discord => base.Discord as DiscordSocketClient;

src/Discord.Net/Entities/WebSocket/CachedDMUser.cs

@@ -7,6 +7,8 @@ namespace Discord
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     internal class CachedDMUser : ICachedUser
     {
+        bool IEntity<ulong>.IsAttached => true;
+
         public CachedGlobalUser User { get; }
 
         public DiscordSocketClient Discord => User.Discord;

src/Discord.Net/Entities/WebSocket/CachedGlobalUser.cs

@@ -6,6 +6,8 @@ namespace Discord
 {
     internal class CachedGlobalUser : User, ICachedUser
     {
+        bool IEntity<ulong>.IsAttached => true;
+
         private ushort _references;
 
         public Presence Presence { get; private set; }

src/Discord.Net/Entities/WebSocket/CachedGroupChannel.cs

@@ -13,6 +13,8 @@ namespace Discord
 {
     internal class CachedGroupChannel : GroupChannel, IGroupChannel, ICachedChannel, ICachedMessageChannel, ICachedPrivateChannel
     {
+        bool IEntity<ulong>.IsAttached => true;
+
         private readonly MessageManager _messages;
         private ConcurrentDictionary<ulong, VoiceState> _voiceStates;
 

src/Discord.Net/Entities/WebSocket/CachedGroupUser.cs

@@ -5,6 +5,8 @@ namespace Discord
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     internal class CachedGroupUser : GroupUser, ICachedUser
     {
+        bool IEntity<ulong>.IsAttached => true;
+
         public new DiscordSocketClient Discord => base.Discord as DiscordSocketClient;
         public new CachedGroupChannel Channel => base.Channel as CachedGroupChannel;
         public new CachedGlobalUser User => base.User as CachedGlobalUser;

src/Discord.Net/Entities/WebSocket/CachedGuild.cs

@@ -19,8 +19,10 @@ using VoiceStateModel = Discord.API.VoiceState;
 
 namespace Discord
 {
-    internal class CachedGuild : Guild, ICachedEntity<ulong>, IGuild, IUserGuild
+    internal class CachedGuild : Guild, IGuild, IUserGuild
     {
+        bool IEntity<ulong>.IsAttached => true;
+
         private readonly SemaphoreSlim _audioLock;
         private TaskCompletionSource<bool> _syncPromise, _downloaderPromise;
         private ConcurrentHashSet<ulong> _channels;

src/Discord.Net/Entities/WebSocket/CachedGuildUser.cs

@@ -5,6 +5,8 @@ namespace Discord
 {
     internal class CachedGuildUser : GuildUser, ICachedUser
     {
+        bool IEntity<ulong>.IsAttached => true;
+
         public new DiscordSocketClient Discord => base.Discord as DiscordSocketClient;
         public new CachedGuild Guild => base.Guild as CachedGuild;
         public new CachedGlobalUser User => base.User as CachedGlobalUser;

src/Discord.Net/Entities/WebSocket/CachedMessage.cs

@@ -2,8 +2,10 @@
 
 namespace Discord
 {
-    internal class CachedMessage : Message, ICachedEntity<ulong>
+    internal class CachedMessage : Message
     {
+        bool IEntity<ulong>.IsAttached => true;
+
         public new DiscordSocketClient Discord => base.Discord as DiscordSocketClient;
         public new ICachedMessageChannel Channel => base.Channel as ICachedMessageChannel;
 

src/Discord.Net/Entities/WebSocket/CachedSelfUser.cs

@@ -5,6 +5,8 @@ namespace Discord
 {
     internal class CachedSelfUser : SelfUser, ICachedUser
     {
+        bool IEntity<ulong>.IsAttached => true;
+
         public new DiscordSocketClient Discord => base.Discord as DiscordSocketClient;
         CachedGlobalUser ICachedUser.User { get { throw new NotSupportedException(); } }
 

src/Discord.Net/Entities/WebSocket/CachedTextChannel.cs

@@ -9,6 +9,8 @@ namespace Discord
 {
     internal class CachedTextChannel : TextChannel, ICachedGuildChannel, ICachedMessageChannel
     {
+        bool IEntity<ulong>.IsAttached => true;
+
         private readonly MessageManager _messages;
 
         public new DiscordSocketClient Discord => base.Discord as DiscordSocketClient;

src/Discord.Net/Entities/WebSocket/CachedVoiceChannel.cs

@@ -10,6 +10,8 @@ namespace Discord
 {
     internal class CachedVoiceChannel : VoiceChannel, ICachedGuildChannel
     {
+        bool IEntity<ulong>.IsAttached => true;
+
         public new DiscordSocketClient Discord => base.Discord as DiscordSocketClient;
         public new CachedGuild Guild => base.Guild as CachedGuild;
 

src/Discord.Net/Entities/WebSocket/ICachedEntity.cs

@@ -1,7 +0,0 @@
-namespace Discord
-{
-    internal interface ICachedEntity<T> : IEntity<T>
-    {
-        DiscordSocketClient Discord { get; }
-    }
-}