diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java
index 9fe140cce..dbc45bff8 100644
--- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java
+++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java
@@ -47,7 +47,7 @@ import appeng.container.slot.SlotRestrictedInput;
 import appeng.tile.misc.TileCellWorkbench;
 import appeng.util.Platform;
 import appeng.util.helpers.ItemHandlerUtil;
-import appeng.util.inv.WrapperLazyItemHandler;
+import appeng.util.inv.WrapperSupplierItemHandler;
 import appeng.util.iterators.NullIterator;
 
 
@@ -97,7 +97,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
 		this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.WORKBENCH_CELL, cell, 0, 152, 8, this.getPlayerInv() ) );
 
 		final IItemHandler inv = this.getUpgradeable().getInventoryByName( "config" );
-		final WrapperLazyItemHandler upgradeInventory = new WrapperLazyItemHandler( this::getCellUpgradeInventory );
+		final WrapperSupplierItemHandler upgradeInventory = new WrapperSupplierItemHandler( this::getCellUpgradeInventory );
 		// null, 3 * 8 );
 
 		int offset = 0;
diff --git a/src/main/java/appeng/util/inv/WrapperLazyItemHandler.java b/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java
similarity index 88%
rename from src/main/java/appeng/util/inv/WrapperLazyItemHandler.java
rename to src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java
index 3ae8176d2..7e75b393d 100644
--- a/src/main/java/appeng/util/inv/WrapperLazyItemHandler.java
+++ b/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java
@@ -25,17 +25,16 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
-import appeng.util.Lazy;
 import appeng.util.helpers.ItemHandlerUtil;
 
 
-public class WrapperLazyItemHandler implements IItemHandlerModifiable
+public class WrapperSupplierItemHandler implements IItemHandlerModifiable
 {
-	private final Lazy<IItemHandler> sourceHandler;
+	private final Supplier<IItemHandler> sourceHandler;
 
-	public WrapperLazyItemHandler( Supplier<IItemHandler> source )
+	public WrapperSupplierItemHandler( Supplier<IItemHandler> source )
 	{
-		this.sourceHandler = new Lazy<>( source );
+		this.sourceHandler = source;
 	}
 
 	@Override