diff --git a/arkoala-arkts/arkui/config/etsconfig-base.json b/arkoala-arkts/arkui/config/etsconfig-base.json
index 0e2437d246a75a22ad07fcd57900f1c6bfa47bf8..a1bc1c4e3cb49a2235a702a6b4e3f4f7125c59a9 100644
--- a/arkoala-arkts/arkui/config/etsconfig-base.json
+++ b/arkoala-arkts/arkui/config/etsconfig-base.json
@@ -224,7 +224,8 @@
                 "SaveButton",
                 "UIExtensionComponent",
                 "RichEditor",
-                "CachedImage"
+                "CachedImage",
+                "MediaCachedImage"
             ],
             "extend": {
                 "decorator": [
@@ -796,6 +797,11 @@
                         "name": "CachedImage",
                         "type": "CachedImageAttribute",
                         "instance": "CachedImageInstance"
+                    },
+                    {
+                        "name": "MediaCachedImage",
+                        "type": "MediaCachedImageAttribute",
+                        "instance": "MediaCachedImageInstance"
                     }
                 ]
             },
diff --git a/arkoala-arkts/arkui/src/ForEach.ts b/arkoala-arkts/arkui/src/ForEach.ts
index 7fea31af1bdadc6da449e11311e2771ccc712ff7..b9a6fe2ce199aad487478e9d409796a94e9e6e6a 100644
--- a/arkoala-arkts/arkui/src/ForEach.ts
+++ b/arkoala-arkts/arkui/src/ForEach.ts
@@ -16,13 +16,11 @@
 import { int32, hashCodeFromString } from "@koalaui/common"
 import { RepeatByArray } from "@koalaui/runtime"
 
-// TODO: due to compiler bug with optional lambdas we have to put
-// index: number instead of index?: number here
 /** @memo */
 export function ForEach<T>(data: Array<T>,
     /** @memo */
     itemGenerator: (item: T, index: number) => void,
-    keyGenerator: (item: T, index: number) => string,
+    keyGenerator?: (item: T, index: number) => string,
 ) {
     RepeatByArray<T>(data,
         (element: T, index: int32) => keyGenerator ? hashCodeFromString(keyGenerator!(element, (index as number))) : index,