diff --git a/uc1-application/src/main/java/uc1/streamprocessing/TopologyBuilder.java b/uc1-application/src/main/java/uc1/streamprocessing/TopologyBuilder.java
index e3b31525094859f011097a0e8c1c28b5ed6e7330..0150045acbb4d85bfb8ea40e786cfe41f35f33f5 100644
--- a/uc1-application/src/main/java/uc1/streamprocessing/TopologyBuilder.java
+++ b/uc1-application/src/main/java/uc1/streamprocessing/TopologyBuilder.java
@@ -18,6 +18,7 @@ public class TopologyBuilder {
 	private static final Logger LOGGER = LoggerFactory.getLogger(TopologyBuilder.class);
 
 	private final String inputTopic;
+	private final Gson gson;
 
 	private final StreamsBuilder builder = new StreamsBuilder();
 
@@ -26,18 +27,18 @@ public class TopologyBuilder {
 	 */
 	public TopologyBuilder(final String inputTopic) {
 		this.inputTopic = inputTopic;
+		this.gson = new Gson();
 	}
 
 	/**
 	 * Build the {@link Topology} for the History microservice.
 	 */
 	public Topology build() {
-		final Gson gson = new Gson();
 
 		this.builder
 				.stream(this.inputTopic,
 						Consumed.with(Serdes.String(), IMonitoringRecordSerde.serde(new ActivePowerRecordFactory())))
-				.mapValues(v -> gson.toJson(v)).foreach((k, v) -> LOGGER.info("Key: " + k + " Value: " + v));
+				.mapValues(v -> this.gson.toJson(v)).foreach((k, v) -> LOGGER.info("Key: " + k + " Value: " + v));
 
 		return this.builder.build();
 	}