diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IItemGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IItemGridHandler.java
index 04d9c0e4c..4a838d9ad 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IItemGridHandler.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IItemGridHandler.java
@@ -44,10 +44,10 @@ public interface IItemGridHandler {
     /**
      * Called when a player requests the crafting preview window to be opened.
      *
-     * @param stack    the {@link ItemStack} to request a craft for
+     * @param hash     the item stack hash
      * @param quantity the amount of that item that we need a preview for
      */
-    void onCraftingPreviewRequested(EntityPlayerMP player, ItemStack stack, int quantity);
+    void onCraftingPreviewRequested(EntityPlayerMP player, int hash, int quantity);
 
     /**
      * Called when a player requested crafting for an item.
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/ItemGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/ItemGridHandler.java
index 56386c4f8..2d6a50c24 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/ItemGridHandler.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/ItemGridHandler.java
@@ -2,7 +2,6 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.grid;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.RSUtils;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
 import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
 import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
 import com.raoulvdberge.refinedstorage.api.network.grid.IItemGridHandler;
@@ -142,7 +141,9 @@ public class ItemGridHandler implements IItemGridHandler {
     }
 
     @Override
-    public void onCraftingPreviewRequested(EntityPlayerMP player, ItemStack stack, int quantity) {
+    public void onCraftingPreviewRequested(EntityPlayerMP player, int hash, int quantity) {
+        ItemStack stack = network.getItemStorageCache().getList().get(hash);
+
         if (stack != null) {
             Thread calculationThread = new Thread(() -> {
                 ICraftingTask task = new CraftingTask(network, stack, network.getPattern(stack), quantity);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiCraftingStart.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiCraftingStart.java
index 3423fb0f4..a6e57ba1f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiCraftingStart.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiCraftingStart.java
@@ -176,7 +176,7 @@ public class GuiCraftingStart extends GuiBase {
         Integer quantity = Ints.tryParse(amountField.getText());
 
         if (quantity != null && quantity > 0) {
-            RS.INSTANCE.network.sendToServer(new MessageGridCraftingPreview(stack.getStack(), quantity));
+            RS.INSTANCE.network.sendToServer(new MessageGridCraftingPreview(stack.getHash(), quantity));
 
             startButton.enabled = false;
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreview.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreview.java
index 42b187b4f..f98bb3f34 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreview.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreview.java
@@ -4,31 +4,29 @@ import com.raoulvdberge.refinedstorage.container.ContainerGrid;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.Container;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.common.network.ByteBufUtils;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 
 public class MessageGridCraftingPreview extends MessageHandlerPlayerToServer<MessageGridCraftingPreview> implements IMessage {
-    private ItemStack stack;
+    private int hash;
     private int quantity;
 
     public MessageGridCraftingPreview() {
     }
 
-    public MessageGridCraftingPreview(ItemStack stack, int quantity) {
-        this.stack = stack;
+    public MessageGridCraftingPreview(int hash, int quantity) {
+        this.hash = hash;
         this.quantity = quantity;
     }
 
     @Override
     public void fromBytes(ByteBuf buf) {
-        stack = ByteBufUtils.readItemStack(buf);
+        hash = buf.readInt();
         quantity = buf.readInt();
     }
 
     @Override
     public void toBytes(ByteBuf buf) {
-        ByteBufUtils.writeItemStack(buf, stack);
+        buf.writeInt(hash);
         buf.writeInt(quantity);
     }
 
@@ -37,7 +35,7 @@ public class MessageGridCraftingPreview extends MessageHandlerPlayerToServer<Mes
         Container container = player.openContainer;
 
         if (container instanceof ContainerGrid) {
-            ((ContainerGrid) container).getGrid().getItemHandler().onCraftingPreviewRequested(player, message.stack, message.quantity);
+            ((ContainerGrid) container).getGrid().getItemHandler().onCraftingPreviewRequested(player, message.hash, message.quantity);
         }
     }
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
index 46f7ebd58..42f353262 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java
@@ -455,8 +455,6 @@ public class TileController extends TileBase implements INetworkMaster, IRedston
                 patterns.addAll(((ICraftingPatternContainer) node).getPatterns());
             }
         }
-
-        itemStorage.invalidate();
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
index b94b1c520..a43a95a10 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
@@ -25,7 +25,6 @@ public abstract class TileNode extends TileBase implements INetworkNode, IRedsto
 
     private RedstoneMode redstoneMode = RedstoneMode.IGNORE;
     private boolean active;
-    private boolean rebuildNeighbors;
     protected boolean rebuildOnUpdateChange;
 
     protected INetworkMaster network;
@@ -49,7 +48,9 @@ public abstract class TileNode extends TileBase implements INetworkNode, IRedsto
     public void update() {
         if (!getWorld().isRemote) {
             boolean wasActive = active;
+
             active = hasNetwork() && canUpdate();
+
             if (active != wasActive) {
                 if (hasConnectivityState()) {
                     updateBlock();