diff --git a/Jellyfin.Plugin.Danmu/LibraryManagerEventsHelper.cs b/Jellyfin.Plugin.Danmu/LibraryManagerEventsHelper.cs
index c9fc132..532328b 100644
--- a/Jellyfin.Plugin.Danmu/LibraryManagerEventsHelper.cs
+++ b/Jellyfin.Plugin.Danmu/LibraryManagerEventsHelper.cs
@@ -537,6 +537,7 @@ public class LibraryManagerEventsHelper : IDisposable
 
                 var queueUpdateMeta = new List<BaseItem>();
                 // GetEpisodes一定要取所有fields，要不然更新会导致重建虚拟season季信息
+                // TODO：可能出现未刮削完，就触发获取弹幕，导致GetEpisodes只能获取到部分剧集的情况
                 var episodes = season.GetEpisodes(null, new DtoOptions(true));
                 if (episodes == null)
                 {
diff --git a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Bilibili.cs b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Bilibili.cs
index 42182f5..809c8de 100644
--- a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Bilibili.cs
+++ b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/Bilibili.cs
@@ -242,19 +242,14 @@ public class Bilibili : AbstractScraper
             return null;
         }
 
-        var season = await _api.GetEpisodeAsync(epId, CancellationToken.None).ConfigureAwait(false);
-        if (season == null)
+        var epInfo = await _api.GetEpisodeAsync(epId, CancellationToken.None).ConfigureAwait(false);
+        if (epInfo == null)
         {
             log.LogInformation("获取不到b站视频信息：EpisodeId={0}", epId);
             return null;
         }
 
-        if (season.Episodes.Count > 0)
-        {
-            return new ScraperEpisode() { Id = $"{season.Episodes[0].Id}", CommentId = $"{season.Episodes[0].CId}" };
-        }
-
-        return null;
+        return new ScraperEpisode() { Id = $"{epInfo.Id}", CommentId = $"{epInfo.CId}" };
     }
 
     public override async Task<ScraperDanmaku?> GetDanmuContent(BaseItem item, string commentId)
diff --git a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/BilibiliApi.cs b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/BilibiliApi.cs
index de59648..c79f298 100644
--- a/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/BilibiliApi.cs
+++ b/Jellyfin.Plugin.Danmu/Scrapers/Bilibili/BilibiliApi.cs
@@ -126,14 +126,10 @@ public class BilibiliApi : AbstractApi
         }
 
 
-        var season = await GetEpisodeAsync(epId, cancellationToken).ConfigureAwait(false);
-        if (season != null && season.Episodes.Count > 0)
+        var episode = await GetEpisodeAsync(epId, cancellationToken).ConfigureAwait(false);
+        if (episode != null)
         {
-            var episode = season.Episodes.First(x => x.Id == epId);
-            if (episode != null)
-            {
-                return await GetDanmuContentByCidAsync(episode.CId, cancellationToken).ConfigureAwait(false);
-            }
+            return await GetDanmuContentByCidAsync(episode.CId, cancellationToken).ConfigureAwait(false);
         }
 
         throw new Exception($"Request fail. epId={epId}");
@@ -196,7 +192,7 @@ public class BilibiliApi : AbstractApi
         return null;
     }
 
-    public async Task<VideoSeason?> GetEpisodeAsync(long epId, CancellationToken cancellationToken)
+    public async Task<VideoEpisode?> GetEpisodeAsync(long epId, CancellationToken cancellationToken)
     {
         if (epId <= 0)
         {
@@ -204,11 +200,11 @@ public class BilibiliApi : AbstractApi
         }
 
         var cacheKey = $"episode_{epId}";
-        var expiredOption = new MemoryCacheEntryOptions() { AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(30) };
-        VideoSeason? seasonData;
-        if (_memoryCache.TryGetValue<VideoSeason?>(cacheKey, out seasonData))
+        var expiredOption = new MemoryCacheEntryOptions() { AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(5) };
+        VideoEpisode? episodeData;
+        if (_memoryCache.TryGetValue<VideoEpisode?>(cacheKey, out episodeData))
         {
-            return seasonData;
+            return episodeData;
         }
 
         await EnsureSessionCookie(cancellationToken).ConfigureAwait(false);
@@ -217,13 +213,19 @@ public class BilibiliApi : AbstractApi
         var response = await httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false);
         response.EnsureSuccessStatusCode();
         var result = await response.Content.ReadFromJsonAsync<ApiResult<VideoSeason>>(_jsonOptions, cancellationToken).ConfigureAwait(false);
-        if (result != null && result.Code == 0 && result.Result != null)
+        if (result != null && result.Code == 0 && result.Result != null && result.Result.Episodes != null)
         {
-            _memoryCache.Set<VideoSeason?>(cacheKey, result.Result, expiredOption);
-            return result.Result;
+            // 缓存本季的所有episode数据，避免批量更新时重复请求
+            foreach (var episode in result.Result.Episodes)
+            {
+                cacheKey = $"episode_{episode.Id}";
+                _memoryCache.Set<VideoEpisode?>(cacheKey, episode, expiredOption);
+            }
+
+            return result.Result.Episodes.FirstOrDefault(x => x.Id == epId);
         }
 
-        _memoryCache.Set<VideoSeason?>(cacheKey, null, expiredOption);
+        _memoryCache.Set<VideoEpisode?>(cacheKey, null, expiredOption);
         return null;
     }