diff --git a/gradle.properties b/gradle.properties
index 74ff519cb..2d25c4fab 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
 extended=extended_life
-extendedversion=v51c
+extendedversion=v51d
 #########################################################
 # Versions                                              #
 #########################################################
diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java
index 058bea92e..a11e3fce2 100644
--- a/src/main/java/appeng/crafting/CraftingTreeProcess.java
+++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java
@@ -305,6 +305,7 @@ public class CraftingTreeProcess
 						containerItems = new ArrayList<>();
 					}
 					this.bytes++;
+					o.setCachedItemStack( is );
 					containerItems.add( o );
 				}
 			}
diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java
index 8e9b7acb1..79ca03a68 100644
--- a/src/main/java/appeng/helpers/DualityInterface.java
+++ b/src/main/java/appeng/helpers/DualityInterface.java
@@ -909,10 +909,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 					changed = true;
 					throw new GridAccessException();
 				}
-				else
-				{
-					itemStack.setCachedItemStack( inputStack );
-				}
 
 				IAEItemStack storedStack = this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).getStorageList().findPrecise( itemStack );
 				if( storedStack != null )
@@ -930,8 +926,12 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 					}
 					else if( storedStack.isCraftable() )
 					{
-						changed = this.handleCrafting( x, adaptor, itemStack ) || changed;
+                        itemStack.setCachedItemStack(inputStack);
+                        changed = this.handleCrafting( x, adaptor, itemStack ) || changed;
 					}
+					if (acquired == null) {
+                        itemStack.setCachedItemStack(inputStack);
+                    }
 				}
 			}
 			// else wtf?
diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java
index d0b4b5730..7a661e069 100644
--- a/src/main/java/appeng/util/item/AEItemStack.java
+++ b/src/main/java/appeng/util/item/AEItemStack.java
@@ -285,6 +285,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
 		if( this.cachedItemStack != null )
 		{
 			currentCached = this.cachedItemStack;
+            this.cachedItemStack = null;
 		}
 
 		ItemStack itemStack;