diff --git a/src/Components/MangaCard.razor b/src/Components/MangaCard.razor
index ebbd35d..79f6be2 100644
--- a/src/Components/MangaCard.razor
+++ b/src/Components/MangaCard.razor
@@ -1,14 +1,13 @@
-
-@using Grimoire.Models
+@using Grimoire.Models
 @using Grimoire.Handlers
 @using Grimoire.Helpers
 
-@inject CacheHandler CacheHandler
+@inject DatabaseHandler DatabaseHandler
 @inject NavigationManager NavigationManager
 @inject IConfiguration Configuration
 
 <div class="card h-100 shadow-sm" @onclick="() => NavTo(Manga.Id)">
-    <img src="@Configuration.GetCover(CacheHandler.Get<string>($"{SourceId}@{Manga.Id}"), Manga.Cover)"
+    <img src="@Configuration.GetCover(DatabaseHandler.Get<string>($"{SourceId}@{Manga.Id}")!, Manga.Cover)"
          class="card-img-top" alt="@Manga.Name">
     <div class="card-body">
         <h5 class="card-title">
@@ -48,8 +47,7 @@
     }
 
     private static string Truncate(string str) {
-        return str?.Length > 150 ?
-            $"{str[..150]}..." : str;
+        return str.Length > 150 ? $"{str[..150]}..." : str;
     }
 
 }
\ No newline at end of file
diff --git a/src/Handlers/DatabaseHandler.cs b/src/Handlers/DatabaseHandler.cs
index 7964d85..0843a39 100644
--- a/src/Handlers/DatabaseHandler.cs
+++ b/src/Handlers/DatabaseHandler.cs
@@ -212,7 +212,7 @@ public async Task<Chapter> GetChapterAsync(string sourceId, string mangaId, int
         return chapter;
     }
 
-    public async Task<IReadOnlyList<IGrimoireSource>> ListSourcesAsync(string sourceId) {
+    public async Task<IReadOnlyList<IGrimoireSource>> ListSourcesAsync() {
         if (!config.GetValue<bool>("Save:SourceIcon")) {
             return _sources.ToArray();
         }
diff --git a/src/Pages/ChapterPage.razor b/src/Pages/ChapterPage.razor
index 151e4ef..ad47767 100644
--- a/src/Pages/ChapterPage.razor
+++ b/src/Pages/ChapterPage.razor
@@ -5,7 +5,7 @@
 @using Grimoire.Handlers
 @using Grimoire.Helpers
 
-@inject CacheHandler CacheHandler
+@inject DatabaseHandler DatabaseHandler
 
 <div class="container-lg py-4">
     <picture class="p-4">
@@ -43,10 +43,10 @@
         => $"Loading {MangaId.GetNameFromId()} {Chap}";
 
     protected override async Task OnInitializedAsync() {
-        _chapter = await CacheHandler.GetChapterAsync(SourceId, MangaId, Chap);
-        _chapter = !string.IsNullOrWhiteSpace(Chapter) ?
-            await CacheHandler.GetChapterAsync(SourceId, MangaId, Chapter) :
-            await CacheHandler.GetChapterAsync(SourceId, MangaId, Chap);
+        _chapter = await DatabaseHandler.GetChapterAsync(SourceId, MangaId, Chap);
+        _chapter = !string.IsNullOrWhiteSpace(Chapter)
+            ? await DatabaseHandler.GetChapterAsync(SourceId, MangaId, int.Parse(Chapter))
+            : await DatabaseHandler.GetChapterAsync(SourceId, MangaId, Chap);
     }
 
 }
\ No newline at end of file
diff --git a/src/Pages/Index.razor b/src/Pages/Index.razor
index a1ae38c..da88a57 100644
--- a/src/Pages/Index.razor
+++ b/src/Pages/Index.razor
@@ -3,7 +3,7 @@
 @using Grimoire.Handlers
 
 @inject NavigationManager NavigationManager
-@inject DbHandler DbHandler
+@inject DatabaseHandler DbHandler
 
 <div class="container-lg py-4">
     <div class="row row-cols-1 g-5">
@@ -24,8 +24,8 @@
                             }
                             else {
                                 @foreach (var manga in _mangas
-                                    .OrderByDescending(x => x.Chapters.FirstOrDefault().ReleasedOn)
-                                    .Take(10)) {
+                                              .OrderByDescending(x => x.Chapters.FirstOrDefault().ReleasedOn)
+                                              .Take(10)) {
                                     var chapter = manga.Chapters.FirstOrDefault();
                                     <a class="list-group-item d-flex justify-content-between align-items-start list-group-item-action"
                                        @onclick="() => GoToChapter(manga.SourceId, manga.Id, chapter.Name)">
diff --git a/src/Pages/MangaPage.razor b/src/Pages/MangaPage.razor
index 132e4df..ef9bb03 100644
--- a/src/Pages/MangaPage.razor
+++ b/src/Pages/MangaPage.razor
@@ -4,8 +4,7 @@
 @using Grimoire.Handlers
 @using Grimoire.Helpers
 
-@inject DbHandler DbHandler
-@inject CacheHandler CacheHandler
+@inject DatabaseHandler DbHandler
 @inject IConfiguration Configuration
 @inject NavigationManager NavigationManager
 
@@ -19,7 +18,7 @@ else {
                 <div class="card mb-3 shadow rounded-4">
                     <div class="row gy-4">
                         <div class="col-md-4">
-                            <img src="@Configuration.GetCover(CacheHandler.Get<string>($"{SourceId}@{_manga.Id}"), _manga.Cover)"
+                            <img src="@Configuration.GetCover(DbHandler.Get<string>($"{SourceId}@{_manga.Id}"), _manga.Cover)"
                                  class="card-img" alt="@_manga.Name">
                         </div>
 
@@ -123,7 +122,7 @@ else {
         => $"Loading {MangaId.GetNameFromId()}";
 
     protected override async Task OnInitializedAsync() {
-        _manga = await CacheHandler.GetMangaAsync(SourceId, MangaId);
+        _manga = await DbHandler.GetMangaAsync(SourceId, MangaId);
     }
 
     private void NavTo(int chapter) {
diff --git a/src/Pages/SourcePage.razor b/src/Pages/SourcePage.razor
index 8342a98..c9d44bb 100644
--- a/src/Pages/SourcePage.razor
+++ b/src/Pages/SourcePage.razor
@@ -5,7 +5,7 @@
 @using Grimoire.Helpers
 @using Grimoire.Models
 
-@inject CacheHandler CacheHandler
+@inject DatabaseHandler DatabaseHandler
 @inject NavigationManager NavigationManager
 
 <div class="container-lg py-4">
@@ -19,7 +19,7 @@
                     <div class="card-header">
                         <div class="d-flex justify-content-between align-items-start">
                             <h3 class="card-title">
-                                <img src="@CacheHandler.GetSourceIcon(SourceId)"
+                                <img src="@DatabaseHandler.GetSourceIcon(SourceId)"
                                      alt="@SourceId" width="20">
                                 <span>@SourceId.GetNameFromId() | <span class="badge bg-dark">Mangas: @_book.ItemCount</span></span>
 
@@ -79,13 +79,13 @@
     private Page _currentPage;
 
     protected override async Task OnInitializedAsync() {
-        var mangas = await CacheHandler.GetMangasAsync(SourceId, false);
+        var mangas = await DatabaseHandler.GetMangasAsync(SourceId, false);
         _book = new Book(mangas);
         _currentPage = _book.GoTo(PageNumber);
     }
 
     private async Task RefreshAsync() {
-        var mangas = await CacheHandler.GetMangasAsync(SourceId, true);
+        var mangas = await DatabaseHandler.GetMangasAsync(SourceId, true);
         _book = new Book(mangas);
         _currentPage = _book.GoTo(PageNumber);
     }
diff --git a/src/Pages/SourcesPage.razor b/src/Pages/SourcesPage.razor
index 9393e76..743c4e0 100644
--- a/src/Pages/SourcesPage.razor
+++ b/src/Pages/SourcesPage.razor
@@ -2,7 +2,7 @@
 @using Grimoire.Handlers
 @using Grimoire.Sources.Interfaces
 
-@inject CacheHandler CacheHandler
+@inject DatabaseHandler DatabaseHandler
 @inject NavigationManager NavigationManager
 
 <div class="container p-4">
@@ -14,7 +14,7 @@
             <ul class="list-group list-group-flush">
                 @foreach (var source in _sources) {
                     <a class="list-group-item list-group-item-action" @onclick="() => NavTo(source.Id)">
-                        <img src="@CacheHandler.GetSourceIcon(source.Id)" class="img-thumbnail" alt="@source.Name" width="70">
+                        <img src="@DatabaseHandler.GetSourceIcon(source.Id)" class="img-thumbnail" alt="@source.Name" width="70">
                         <span>@source.Name</span>
                     </a>
                 }
@@ -27,7 +27,7 @@
     private IReadOnlyList<IGrimoireSource> _sources;
 
     protected override async Task OnInitializedAsync() {
-        _sources = await CacheHandler.GetSourcesAsync();
+        _sources = await DatabaseHandler.ListSourcesAsync();
     }
 
     private void NavTo(string sourceId) {