Index: trunk/i386/boot2/boot.c
===================================================================
--- trunk/i386/boot2/boot.c	(revision 1464)
+++ trunk/i386/boot2/boot.c	(revision 1465)
@@ -610,7 +610,13 @@
 		
 		verbose("Loading Darwin %s\n", gMacOSVersion);
 
-		useKernelCache = false; // by default don't use prelink kernel cache
+		// If boot from boot helper partitions and OS is Lion use prelink kernel.
+		// We need to find a solution to load extra mkext with a prelink kernel.
+		if (gBootVolume->flags & kBVFlagBooter && checkOSVersion("10.7"))
+			useKernelCache = true;
+		else
+			useKernelCache = false; // by default don't use prelink kernel cache
+
 		getBoolForKey(kUseKernelCache, &useKernelCache, &bootInfo->chameleonConfig);
 
 		if (useKernelCache) do {
@@ -627,19 +633,6 @@
 				kernelCacheFile[0] = 0; // Use default kernel cache file
 			}
 
-			// If boot from boot helper partitions and OS is Lion use prelink kernel.
-			// We need to find a solution to load extra mkext with a prelink kernel.
-			if (gBootVolume->flags & kBVFlagBooter && checkOSVersion("10.7")) {
-				verbose("Booting from Lion RAID volume so forcing to use KernelCache\n");
-				useKernelCache = true;
-				break;
-			}
-
-			if ((gBootMode & kBootModeSafe) == 1) {
-				verbose("Booting in 'Boot Safe' mode, KernelCache will not be used\n");
-				useKernelCache = false;
-				break;
-			}
 			if (gOverrideKernel && kernelCacheFile[0] == 0) {
 				verbose("Using a non default kernel (%s) without specifying 'Kernel Cache' path, KernelCache will not be used\n",
 						bootInfo->bootFile);
Index: trunk/doc/BootHelp.txt
===================================================================
--- trunk/doc/BootHelp.txt	(revision 1464)
+++ trunk/doc/BootHelp.txt	(revision 1465)
@@ -68,8 +68,9 @@
 
   PciRoot=<value>         Use an alternate value for PciRoot (default value 0).
 
-  UseKernelCache=Yes|No   Default is No. Yes will load pre-linked kernel and will
-                            ignore /E/E and /S/L/E/Extensions.mkext.
+  UseKernelCache=Yes|No   Yes will load pre-linked kernel and will ignore /E/E
+						    and /S/L/E/Extensions.mkext.
+							Default is No but Yes if you use Lion on a Raid partition.
 
   GraphicsEnabler=Yes|No  Automatic device-properties generation for gfx cards.
     AtiConfig=<cardcfg>   Use a different card config, e.g. AtiConfig=Megalodon.