diff --git a/js/DocumentService.js b/js/DocumentService.js
index e9973fb..1560840 100644
--- a/js/DocumentService.js
+++ b/js/DocumentService.js
@@ -15,6 +15,10 @@ export class DocumentService {
         this.indexService = indexService;
         /** @type {Promise<marked>} */
         this.markedPromise = this.initializeMarked();
+        /** @type {Map<string, LoadedDocument>} */
+        this.documentCache = new Map();
+        /** @type {number} */
+        this.cacheMaxSize = 20;
     }
 
     /**
@@ -50,8 +54,15 @@ export class DocumentService {
      */
     setupRenderer(renderer) {
         const originalLink = renderer.link.bind(renderer);
+        const originalImage = renderer.image.bind(renderer);
 
         renderer.code = this.renderCode;
+        
+        renderer.image = (href, title, text) => {
+            const titleAttr = title ? ` title="${title}"` : '';
+            return `<img src="${href}" alt="${text}"${titleAttr} loading="lazy">`;
+        };
+
         renderer.link = (href, title, text) => {
             const isExternal = href.startsWith('http');
             const attrs = isExternal ? ' target="_blank" rel="noopener noreferrer"' : '';
@@ -138,6 +149,10 @@ export class DocumentService {
      * @throws {Error} If the document fails to load.
      */
     async loadDocument(path) {
+        if (this.documentCache.has(path)) {
+            return this.documentCache.get(path);
+        }
+
         try {
             const [response, marked] = await Promise.all([
                 fetch(path),
@@ -163,12 +178,20 @@ export class DocumentService {
             const titleContent = metadata.title || indexDoc?.title || path.split('/').pop().replace('.md', '');
             processedContent = this.ensureTitle(processedContent, titleContent);
 
-            return {
+            const result = {
                 content: processedContent,
                 metadata,
                 marked,
                 title: titleContent
             };
+
+            if (this.documentCache.size >= this.cacheMaxSize) {
+                const firstKey = this.documentCache.keys().next().value;
+                this.documentCache.delete(firstKey);
+            }
+            this.documentCache.set(path, result);
+
+            return result;
         } catch (error) {
             throw new Error('Failed to load document');
         }
@@ -239,15 +262,30 @@ export class DocumentService {
             const mediaPath = `./docs/images/${filename}`;
 
             if (filename.toLowerCase().endsWith('.mp4')) {
-                return `\n<video controls width="100%">
+                return `\n<video controls width="100%" preload="metadata">
                     <source src="${mediaPath}" type="video/mp4">
                     Your browser does not support the video tag.
                 </video>\n\n`;
             }
 
-            return `\n![${filename}](${mediaPath})\n\n`;
+            return `\n<img src="${mediaPath}" alt="${filename}" loading="lazy">\n\n`;
         });
     }
+
+    /**
+     * Clears the entire document cache.
+     */
+    clearCache() {
+        this.documentCache.clear();
+    }
+
+    /**
+     * Invalidates a specific document from the cache.
+     * @param {string} path - The document path to invalidate.
+     */
+    invalidateDocument(path) {
+        this.documentCache.delete(path);
+    }
 }
 
 /**
diff --git a/js/SearchService.js b/js/SearchService.js
index 0a3c871..4dd6f1e 100644
--- a/js/SearchService.js
+++ b/js/SearchService.js
@@ -15,6 +15,10 @@ export class SearchService {
         this.indexService = indexService;
         /** @type {Array<SearchIndexItem>} */
         this.searchIndex = [];
+        /** @type {Map<string, Array<SearchResult>>} */
+        this.searchCache = new Map();
+        /** @type {number} */
+        this.cacheMaxSize = 50;
     }
 
     /**
@@ -23,6 +27,7 @@ export class SearchService {
      */
     buildSearchIndex(documents) {
         this.searchIndex = [];
+        this.searchCache.clear();
         this.processDocuments(documents);
     }
 
@@ -132,11 +137,23 @@ export class SearchService {
         if (!query) return [];
         query = query.toLowerCase();
 
-        return this.searchIndex
+        if (this.searchCache.has(query)) {
+            return this.searchCache.get(query);
+        }
+
+        const results = this.searchIndex
             .map(item => this.scoreItem(item, query))
             .filter(item => item.score > 0)
             .sort((a, b) => b.score - a.score)
             .slice(0, 10);
+
+        if (this.searchCache.size >= this.cacheMaxSize) {
+            const firstKey = this.searchCache.keys().next().value;
+            this.searchCache.delete(firstKey);
+        }
+        this.searchCache.set(query, results);
+
+        return results;
     }
 
     /**
@@ -160,6 +177,13 @@ export class SearchService {
 
         return { ...item, score };
     }
+
+    /**
+     * Clears the search result cache.
+     */
+    clearCache() {
+        this.searchCache.clear();
+    }
 }
 
 /**