diff --git a/benchmark/src/androidTest/java/com/vitorpamplona/amethyst/benchmark/RobohashPartsBenchmark.kt b/benchmark/src/androidTest/java/com/vitorpamplona/amethyst/benchmark/RobohashPartsBenchmark.kt
index aa3715476..ee96bafce 100644
--- a/benchmark/src/androidTest/java/com/vitorpamplona/amethyst/benchmark/RobohashPartsBenchmark.kt
+++ b/benchmark/src/androidTest/java/com/vitorpamplona/amethyst/benchmark/RobohashPartsBenchmark.kt
@@ -25,57 +25,57 @@ import androidx.benchmark.junit4.measureRepeated
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.vitorpamplona.amethyst.commons.parts.accessory0Seven
-import com.vitorpamplona.amethyst.commons.parts.accessory1Nose
-import com.vitorpamplona.amethyst.commons.parts.accessory2HornRed
-import com.vitorpamplona.amethyst.commons.parts.accessory3Button
-import com.vitorpamplona.amethyst.commons.parts.accessory4Satellite
-import com.vitorpamplona.amethyst.commons.parts.accessory5Mustache
-import com.vitorpamplona.amethyst.commons.parts.accessory6Hat
-import com.vitorpamplona.amethyst.commons.parts.accessory7Antenna
-import com.vitorpamplona.amethyst.commons.parts.accessory8Brush
-import com.vitorpamplona.amethyst.commons.parts.accessory9Horn
-import com.vitorpamplona.amethyst.commons.parts.body0Trooper
-import com.vitorpamplona.amethyst.commons.parts.body1Thin
-import com.vitorpamplona.amethyst.commons.parts.body2Thinnest
-import com.vitorpamplona.amethyst.commons.parts.body3Front
-import com.vitorpamplona.amethyst.commons.parts.body4Round
-import com.vitorpamplona.amethyst.commons.parts.body5Neck
-import com.vitorpamplona.amethyst.commons.parts.body6IronMan
-import com.vitorpamplona.amethyst.commons.parts.body7NeckThinner
-import com.vitorpamplona.amethyst.commons.parts.body8Big
-import com.vitorpamplona.amethyst.commons.parts.body9Huge
-import com.vitorpamplona.amethyst.commons.parts.eyes0Squint
-import com.vitorpamplona.amethyst.commons.parts.eyes1Round
-import com.vitorpamplona.amethyst.commons.parts.eyes2Single
-import com.vitorpamplona.amethyst.commons.parts.eyes3Scott
-import com.vitorpamplona.amethyst.commons.parts.eyes4RoundSingle
-import com.vitorpamplona.amethyst.commons.parts.eyes5RoundSmall
-import com.vitorpamplona.amethyst.commons.parts.eyes6WallE
-import com.vitorpamplona.amethyst.commons.parts.eyes7Bar
-import com.vitorpamplona.amethyst.commons.parts.eyes8SmallBar
-import com.vitorpamplona.amethyst.commons.parts.eyes9Shield
-import com.vitorpamplona.amethyst.commons.parts.face0C3po
-import com.vitorpamplona.amethyst.commons.parts.face1Rock
-import com.vitorpamplona.amethyst.commons.parts.face2Long
-import com.vitorpamplona.amethyst.commons.parts.face3Oval
-import com.vitorpamplona.amethyst.commons.parts.face4Cylinder
-import com.vitorpamplona.amethyst.commons.parts.face5Baloon
-import com.vitorpamplona.amethyst.commons.parts.face6Triangle
-import com.vitorpamplona.amethyst.commons.parts.face7Bent
-import com.vitorpamplona.amethyst.commons.parts.face8TriangleInv
-import com.vitorpamplona.amethyst.commons.parts.face9Square
-import com.vitorpamplona.amethyst.commons.parts.mouth0Horz
-import com.vitorpamplona.amethyst.commons.parts.mouth1Cylinder
-import com.vitorpamplona.amethyst.commons.parts.mouth2Teeth
-import com.vitorpamplona.amethyst.commons.parts.mouth3Grid
-import com.vitorpamplona.amethyst.commons.parts.mouth4Vert
-import com.vitorpamplona.amethyst.commons.parts.mouth5MidOpen
-import com.vitorpamplona.amethyst.commons.parts.mouth6Cell
-import com.vitorpamplona.amethyst.commons.parts.mouth7Happy
-import com.vitorpamplona.amethyst.commons.parts.mouth8Buttons
-import com.vitorpamplona.amethyst.commons.parts.mouth9Closed
 import com.vitorpamplona.amethyst.commons.robohash.Black
+import com.vitorpamplona.amethyst.commons.robohash.parts.accessory0Seven
+import com.vitorpamplona.amethyst.commons.robohash.parts.accessory1Nose
+import com.vitorpamplona.amethyst.commons.robohash.parts.accessory2HornRed
+import com.vitorpamplona.amethyst.commons.robohash.parts.accessory3Button
+import com.vitorpamplona.amethyst.commons.robohash.parts.accessory4Satellite
+import com.vitorpamplona.amethyst.commons.robohash.parts.accessory5Mustache
+import com.vitorpamplona.amethyst.commons.robohash.parts.accessory6Hat
+import com.vitorpamplona.amethyst.commons.robohash.parts.accessory7Antenna
+import com.vitorpamplona.amethyst.commons.robohash.parts.accessory8Brush
+import com.vitorpamplona.amethyst.commons.robohash.parts.accessory9Horn
+import com.vitorpamplona.amethyst.commons.robohash.parts.body0Trooper
+import com.vitorpamplona.amethyst.commons.robohash.parts.body1Thin
+import com.vitorpamplona.amethyst.commons.robohash.parts.body2Thinnest
+import com.vitorpamplona.amethyst.commons.robohash.parts.body3Front
+import com.vitorpamplona.amethyst.commons.robohash.parts.body4Round
+import com.vitorpamplona.amethyst.commons.robohash.parts.body5Neck
+import com.vitorpamplona.amethyst.commons.robohash.parts.body6IronMan
+import com.vitorpamplona.amethyst.commons.robohash.parts.body7NeckThinner
+import com.vitorpamplona.amethyst.commons.robohash.parts.body8Big
+import com.vitorpamplona.amethyst.commons.robohash.parts.body9Huge
+import com.vitorpamplona.amethyst.commons.robohash.parts.eyes0Squint
+import com.vitorpamplona.amethyst.commons.robohash.parts.eyes1Round
+import com.vitorpamplona.amethyst.commons.robohash.parts.eyes2Single
+import com.vitorpamplona.amethyst.commons.robohash.parts.eyes3Scott
+import com.vitorpamplona.amethyst.commons.robohash.parts.eyes4RoundSingle
+import com.vitorpamplona.amethyst.commons.robohash.parts.eyes5RoundSmall
+import com.vitorpamplona.amethyst.commons.robohash.parts.eyes6WallE
+import com.vitorpamplona.amethyst.commons.robohash.parts.eyes7Bar
+import com.vitorpamplona.amethyst.commons.robohash.parts.eyes8SmallBar
+import com.vitorpamplona.amethyst.commons.robohash.parts.eyes9Shield
+import com.vitorpamplona.amethyst.commons.robohash.parts.face0C3po
+import com.vitorpamplona.amethyst.commons.robohash.parts.face1Rock
+import com.vitorpamplona.amethyst.commons.robohash.parts.face2Long
+import com.vitorpamplona.amethyst.commons.robohash.parts.face3Oval
+import com.vitorpamplona.amethyst.commons.robohash.parts.face4Cylinder
+import com.vitorpamplona.amethyst.commons.robohash.parts.face5Baloon
+import com.vitorpamplona.amethyst.commons.robohash.parts.face6Triangle
+import com.vitorpamplona.amethyst.commons.robohash.parts.face7Bent
+import com.vitorpamplona.amethyst.commons.robohash.parts.face8TriangleInv
+import com.vitorpamplona.amethyst.commons.robohash.parts.face9Square
+import com.vitorpamplona.amethyst.commons.robohash.parts.mouth0Horz
+import com.vitorpamplona.amethyst.commons.robohash.parts.mouth1Cylinder
+import com.vitorpamplona.amethyst.commons.robohash.parts.mouth2Teeth
+import com.vitorpamplona.amethyst.commons.robohash.parts.mouth3Grid
+import com.vitorpamplona.amethyst.commons.robohash.parts.mouth4Vert
+import com.vitorpamplona.amethyst.commons.robohash.parts.mouth5MidOpen
+import com.vitorpamplona.amethyst.commons.robohash.parts.mouth6Cell
+import com.vitorpamplona.amethyst.commons.robohash.parts.mouth7Happy
+import com.vitorpamplona.amethyst.commons.robohash.parts.mouth8Buttons
+import com.vitorpamplona.amethyst.commons.robohash.parts.mouth9Closed
 import com.vitorpamplona.amethyst.commons.robohash.roboBuilder
 import org.junit.Rule
 import org.junit.Test
diff --git a/commons/src/main/java/com/vitorpamplona/amethyst/commons/data/LargeCache.kt b/commons/src/main/java/com/vitorpamplona/amethyst/commons/data/LargeCache.kt
index c499f6c74..a82f35aba 100644
--- a/commons/src/main/java/com/vitorpamplona/amethyst/commons/data/LargeCache.kt
+++ b/commons/src/main/java/com/vitorpamplona/amethyst/commons/data/LargeCache.kt
@@ -62,6 +62,12 @@ class LargeCache<K, V> {
         return runner.results
     }
 
+    fun <R> map(consumer: BiNotNullMapper<K, V, R>): List<R> {
+        val runner = BiNotNullMapCollector(consumer)
+        innerForEach(runner)
+        return runner.results
+    }
+
     fun <R> mapNotNull(consumer: BiMapper<K, V, R?>): List<R> {
         val runner = BiMapCollector(consumer)
         innerForEach(runner)
@@ -86,12 +92,6 @@ class LargeCache<K, V> {
         return runner.results
     }
 
-    fun <R> map(consumer: BiNotNullMapper<K, V, R>): List<R> {
-        val runner = BiNotNullMapCollector(consumer)
-        innerForEach(runner)
-        return runner.results
-    }
-
     fun sumOf(consumer: BiSumOf<K, V>): Int {
         val runner = BiSumOfCollector(consumer)
         innerForEach(runner)