diff --git a/common/src/main/java/dev/architectury/transfer/access/BlockTransferAccess.java b/common/src/main/java/dev/architectury/transfer/access/BlockTransferAccess.java
index dd786256..6f4007ad 100644
--- a/common/src/main/java/dev/architectury/transfer/access/BlockTransferAccess.java
+++ b/common/src/main/java/dev/architectury/transfer/access/BlockTransferAccess.java
@@ -27,6 +27,8 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Function;
+
 public interface BlockTransferAccess<T, C> extends TransferAccess<T> {
     @Nullable
     T get(Level level, BlockPos pos, C context);
@@ -39,12 +41,6 @@ public interface BlockTransferAccess<T, C> extends TransferAccess<T> {
     @FunctionalInterface
     interface BlockAccessProvider<T, C> {
         @Nullable
-        BlockAccessApplicator<T, C> get(Level level, BlockPos pos, BlockState state, BlockEntity blockEntity);
-    }
-    
-    @FunctionalInterface
-    interface BlockAccessApplicator<T, C> {
-        @Nullable
-        T get(Level level, BlockPos pos, BlockState state, BlockEntity blockEntity, @Nullable C context);
+        Function<C, T> get(Level level, BlockPos pos, BlockState state, BlockEntity blockEntity);
     }
 }
diff --git a/forge/src/main/java/dev/architectury/transfer/forge/ForgeBlockTransferAccess.java b/forge/src/main/java/dev/architectury/transfer/forge/ForgeBlockTransferAccess.java
index 8ce35544..243ed4bc 100644
--- a/forge/src/main/java/dev/architectury/transfer/forge/ForgeBlockTransferAccess.java
+++ b/forge/src/main/java/dev/architectury/transfer/forge/ForgeBlockTransferAccess.java
@@ -29,6 +29,8 @@ import net.minecraftforge.common.util.LazyOptional;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Function;
+
 public interface ForgeBlockTransferAccess<T, C> extends BlockTransferAccess<T, Direction> {
     Capability<C> getCapability();
     
@@ -39,14 +41,14 @@ public interface ForgeBlockTransferAccess<T, C> extends BlockTransferAccess<T, D
         CapabilitiesAttachListeners.add(event -> {
             if (event.getObject() instanceof BlockEntity) {
                 BlockEntity blockEntity = (BlockEntity) event.getObject();
-                BlockAccessApplicator<T, Direction> applicator = provider.get(blockEntity.getLevel(), blockEntity.getBlockPos(), blockEntity.getBlockState(), blockEntity);
+                Function<Direction, T> applicator = provider.get(blockEntity.getLevel(), blockEntity.getBlockPos(), blockEntity.getBlockState(), blockEntity);
                 if (applicator != null) {
                     event.addCapability(id, new ICapabilityProvider() {
                         @NotNull
                         @Override
                         public <S> LazyOptional<S> getCapability(@NotNull Capability<S> capability, @Nullable Direction arg) {
                             if (capability == ForgeBlockTransferAccess.this.getCapability()) {
-                                T handler = applicator.get(blockEntity.getLevel(), blockEntity.getBlockPos(), blockEntity.getBlockState(), blockEntity, arg);
+                                T handler = applicator.apply(arg);
                                 
                                 return LazyOptional.of(() -> from(handler)).cast();
                             }