diff --git a/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/ArbitraryResolver.java b/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/ArbitraryResolver.java
index c9873187f..80ff25b1c 100644
--- a/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/ArbitraryResolver.java
+++ b/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/ArbitraryResolver.java
@@ -64,9 +64,11 @@ public ArbitraryResolver(
 
 	public CombinableArbitrary<?> resolve(
 		RootProperty rootProperty,
-		List<ArbitraryManipulator> manipulators,
-		List<ContainerInfoManipulator> containerInfoManipulators
+		ArbitraryBuilderContext builderContext
 	) {
+		List<ArbitraryManipulator> manipulators = builderContext.getManipulators();
+		List<ContainerInfoManipulator> containerInfoManipulators = builderContext.getContainerInfoManipulators();
+
 		List<MatcherOperator<List<ContainerInfoManipulator>>> registeredContainerInfoManipulators =
 			registeredArbitraryBuilders.stream()
 				.map(it -> new MatcherOperator<>(
diff --git a/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/DefaultArbitraryBuilder.java b/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/DefaultArbitraryBuilder.java
index 533ddd6ff..d79eb44ca 100644
--- a/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/DefaultArbitraryBuilder.java
+++ b/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/DefaultArbitraryBuilder.java
@@ -453,16 +453,11 @@ public ArbitraryBuilderContext getContext() {
 
 	@SuppressWarnings("unchecked")
 	private CombinableArbitrary<?> resolveArbitrary(ArbitraryBuilderContext context) {
-		List<ArbitraryManipulator> manipulators = new ArrayList<>(context.getManipulators());
-		List<ContainerInfoManipulator> containerInfoManipulators =
-			new ArrayList<>(context.getContainerInfoManipulators());
-
 		if (context.isFixed()) {
 			if (context.getFixedCombinableArbitrary() == null || context.fixedExpired()) {
 				Object fixed = resolver.resolve(
 						rootProperty,
-						manipulators,
-						containerInfoManipulators
+						context
 					)
 					.filter(VALIDATION_ANNOTATION_FILTERING_COUNT, validateFilter(context.isValidOnly()))
 					.combined();
@@ -474,8 +469,7 @@ private CombinableArbitrary<?> resolveArbitrary(ArbitraryBuilderContext context)
 
 		return resolver.resolve(
 				rootProperty,
-				manipulators,
-				containerInfoManipulators
+				context
 			)
 			.filter(VALIDATION_ANNOTATION_FILTERING_COUNT, validateFilter(context.isValidOnly()));
 	}