2 files changed, 25 insertions, 14 deletions

diff --git a/server/lib/activitypub/actors/refresh.ts b/server/lib/activitypub/actors/refresh.ts
index 6d8428d66..d15cb5e90 100644
--- a/server/lib/activitypub/actors/refresh.ts
+++ b/server/lib/activitypub/actors/refresh.ts
@@ -1,5 +1,5 @@
 import { logger, loggerTagsFactory } from '@server/helpers/logger'
-import { PromiseCache } from '@server/helpers/promise-cache'
+import { CachePromiseFactory } from '@server/helpers/promise-cache'
 import { PeerTubeRequestError } from '@server/helpers/requests'
 import { ActorLoadByUrlType } from '@server/lib/model-loaders'
 import { ActorModel } from '@server/models/actor/actor'
@@ -16,7 +16,7 @@ type RefreshOptions <T> = {
   fetchedType: ActorLoadByUrlType
 }
 
-const promiseCache = new PromiseCache(doRefresh, (options: RefreshOptions<MActorFull | MActorAccountChannelId>) => options.actor.url)
+const promiseCache = new CachePromiseFactory(doRefresh, (options: RefreshOptions<MActorFull | MActorAccountChannelId>) => options.actor.url)
 
 function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannelId> (options: RefreshOptions<T>): RefreshResult <T> {
   const actorArg = options.actor
diff --git a/server/lib/files-cache/shared/abstract-permanent-file-cache.ts b/server/lib/files-cache/shared/abstract-permanent-file-cache.ts
index 297461035..f990e9872 100644
--- a/server/lib/files-cache/shared/abstract-permanent-file-cache.ts
+++ b/server/lib/files-cache/shared/abstract-permanent-file-cache.ts
@@ -1,10 +1,11 @@
 import express from 'express'
 import { LRUCache } from 'lru-cache'
+import { Model } from 'sequelize'
 import { logger } from '@server/helpers/logger'
+import { CachePromise } from '@server/helpers/promise-cache'
 import { LRU_CACHE, STATIC_MAX_AGE } from '@server/initializers/constants'
 import { downloadImageFromWorker } from '@server/lib/worker/parent-process'
 import { HttpStatusCode } from '@shared/models'
-import { Model } from 'sequelize'
 
 type ImageModel = {
   fileUrl: string
@@ -41,29 +42,39 @@ export abstract class AbstractPermanentFileCache <M extends ImageModel> {
       return res.sendFile(this.filenameToPathUnsafeCache.get(filename), { maxAge: STATIC_MAX_AGE.SERVER })
     }
 
-    const image = await this.loadModel(filename)
+    const image = await this.lazyLoadIfNeeded(filename)
     if (!image) return res.status(HttpStatusCode.NOT_FOUND_404).end()
 
+    const path = image.getPath()
+    this.filenameToPathUnsafeCache.set(filename, path)
+
+    return res.sendFile(path, { maxAge: STATIC_MAX_AGE.LAZY_SERVER }, (err: any) => {
+      if (!err) return
+
+      this.onServeError({ err, image, next, filename })
+    })
+  }
+
+  @CachePromise({
+    keyBuilder: filename => filename
+  })
+  private async lazyLoadIfNeeded (filename: string) {
+    const image = await this.loadModel(filename)
+    if (!image) return undefined
+
     if (image.onDisk === false) {
-      if (!image.fileUrl) return res.status(HttpStatusCode.NOT_FOUND_404).end()
+      if (!image.fileUrl) return undefined
 
       try {
         await this.downloadRemoteFile(image)
       } catch (err) {
         logger.warn('Cannot process remote image %s.', image.fileUrl, { err })
 
-        return res.status(HttpStatusCode.NOT_FOUND_404).end()
+        return undefined
       }
     }
 
-    const path = image.getPath()
-    this.filenameToPathUnsafeCache.set(filename, path)
-
-    return res.sendFile(path, { maxAge: STATIC_MAX_AGE.LAZY_SERVER }, (err: any) => {
-      if (!err) return
-
-      this.onServeError({ err, image, next, filename })
-    })
+    return image
   }
 
   async downloadRemoteFile (image: M) {