diff --git a/bin/domain/repositories/album_repository.dart b/bin/domain/repositories/album_repository.dart
index 17faec3..adb836d 100644
--- a/bin/domain/repositories/album_repository.dart
+++ b/bin/domain/repositories/album_repository.dart
@@ -6,10 +6,17 @@ import '../entities/album.dart';
 
 class AlbumRepository {
   final String basePath;
+  final List<Album> _albums = List.empty(growable: true);
+  DateTime _updated = DateTime.utc(1970);
 
   AlbumRepository({required this.basePath});
 
   Future<List<Album>> getAllAlbums() async {
+    if (DateTime.now().difference(_updated).inSeconds <= 60) {
+      return _albums;
+    }
+    _updated = DateTime.now();
+
     final dir = Directory(basePath);
     if (!await dir.exists()) {
       return [];
@@ -29,7 +36,8 @@ class AlbumRepository {
           );
         })
         .toList();
-
+    _albums.clear();
+    _albums.addAll(albums);
     return albums;
   }
 
diff --git a/bin/domain/repositories/photo_repository.dart b/bin/domain/repositories/photo_repository.dart
index 21207c4..976ca3a 100644
--- a/bin/domain/repositories/photo_repository.dart
+++ b/bin/domain/repositories/photo_repository.dart
@@ -1,3 +1,4 @@
+import 'dart:collection';
 import 'dart:io';
 import 'dart:typed_data';
 
@@ -6,12 +7,19 @@ import '../entities/photo.dart';
 
 class PhotoRepository {
   final String basePath;
+  final Map<int, List<Photo>> _map = HashMap();
+  final Map<int, DateTime> _updatedMap = HashMap();
 
   PhotoRepository(this.basePath);
 
   Future<List<Photo>> getPhotosByAlbumId(int id) async {
-    final dir = Directory(basePath);
+    if (_updatedMap.containsKey(id) &&
+        DateTime.now().difference(_updatedMap[id]!).inSeconds <= 60) {
+      return _map[id]!;
+    }
+    _updatedMap[id] = DateTime.now();
 
+    final dir = Directory(basePath);
     if (!await dir.exists()) {
       return [];
     }
@@ -57,10 +65,15 @@ class PhotoRepository {
       );
     });
 
-    return Future.wait(photoFutures);
+    final photos = await Future.wait(photoFutures);
+    _map[id] = List.from(photos);
+    return photos;
   }
 
   Future<Photo?> getPhotoById(int id) async {
+    try {
+      return _map.values.expand((l) => l).firstWhere((p) => p.id == id);
+    } catch (e) {}
     final dir = Directory(basePath);
 
     if (!await dir.exists()) {