diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/images/InMemoryImagesCache.kt b/src/main/kotlin/com/jetpackduba/gitnuro/images/InMemoryImagesCache.kt
index ee60e206..2cf272f8 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/images/InMemoryImagesCache.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/images/InMemoryImagesCache.kt
@@ -1,5 +1,7 @@
 package com.jetpackduba.gitnuro.images
 
+import com.jetpackduba.gitnuro.logging.printError
+
 object InMemoryImagesCache : ImagesCache {
     private val cachedImages = hashMapOf<String, ByteArray>()
 
@@ -8,6 +10,9 @@ object InMemoryImagesCache : ImagesCache {
     }
 
     override fun cacheImage(urlSource: String, image: ByteArray) {
+        if (cachedImages[urlSource] != null) {
+            printError("CACHE", "Race condition! Image for $urlSource was already in cache")
+        }
         cachedImages[urlSource] = image
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/images/NetworkImageLoader.kt b/src/main/kotlin/com/jetpackduba/gitnuro/images/NetworkImageLoader.kt
index 5b7b73bc..c0d63694 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/images/NetworkImageLoader.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/images/NetworkImageLoader.kt
@@ -6,6 +6,7 @@ import androidx.compose.ui.graphics.toComposeImageBitmap
 import androidx.compose.ui.res.useResource
 import com.jetpackduba.gitnuro.extensions.acquireAndUse
 import com.jetpackduba.gitnuro.extensions.toByteArray
+import com.jetpackduba.gitnuro.logging.printLog
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.withContext
@@ -14,9 +15,13 @@ import java.io.FileNotFoundException
 import java.net.HttpURLConnection
 import java.net.URL
 
-private const val MAX_LOADING_IMAGES = 3
-
 object NetworkImageLoader {
+    // FIXME: Keep this at 1, until we fix locking per-URL
+    // Above 1, the URL-fetch in the critical section will race with itself,
+    // because multiple fetches will be queued while the first image is still being put
+    // into the cache.
+    private const val MAX_LOADING_IMAGES = 1
+
     private val loadingImagesSemaphore = Semaphore(MAX_LOADING_IMAGES)
     private val cache: ImagesCache = InMemoryImagesCache
 
@@ -30,10 +35,19 @@ object NetworkImageLoader {
         try {
             val cachedImage = loadCachedImage(url)
 
-            if (cachedImage != null)
+            if (cachedImage != null) {
                 return@withContext cachedImage
+            }
 
             loadingImagesSemaphore.acquireAndUse {
+                // re-try cache; perhaps another coroutine found the same image
+                // while we were waiting to acquire the semaphore
+                val retryCachedImage = loadCachedImage(url)
+                if (retryCachedImage != null) {
+                    printLog("NET", "found image $url on retry");
+                    return@withContext retryCachedImage
+                }
+
                 val imageByteArray = loadImage(url)
                 cache.cacheImage(url, imageByteArray)
                 return@withContext imageByteArray.toComposeImage()
@@ -51,6 +65,10 @@ object NetworkImageLoader {
     }
 
     suspend fun loadImage(link: String): ByteArray = withContext(Dispatchers.IO) {
+        // Network access can be considered somewhat surprising for a repository-browser
+        // Don't be shy about admitting the work we do.
+        printLog("NET", "loading image from $link")
+
         val url = URL(link)
         val connection = url.openConnection() as HttpURLConnection
         connection.connect()
@@ -100,4 +118,8 @@ fun rememberNetworkImageOrNull(url: String, placeHolderImageRes: String? = null)
 fun ByteArray.toComposeImage() = Image.makeFromEncoded(this).toComposeImageBitmap()
 
 
-internal class ValueHolder<T>(var value: T)
\ No newline at end of file
+internal class ValueHolder<T>(var value: T) {
+    override fun toString(): String {
+        return value.toString()
+    }
+}
\ No newline at end of file