diff --git a/src/main/java/ch/naviqore/raptor/router/StopTimeProvider.java b/src/main/java/ch/naviqore/raptor/router/StopTimeProvider.java
index ad247f58..468e91b3 100644
--- a/src/main/java/ch/naviqore/raptor/router/StopTimeProvider.java
+++ b/src/main/java/ch/naviqore/raptor/router/StopTimeProvider.java
@@ -55,10 +55,9 @@ int[] getStopTimesForDate(LocalDate date, QueryConfig queryConfig) {
     }
 
     private String getCacheKeyForStopTimes(LocalDate date, QueryConfig queryConfig) {
-        String serviceId = tripMaskProvider.getServiceIdForDate(date);
-        String queryConfigKey = String.format("%b-%b-%s", queryConfig.isWheelchairAccessible(),
-                queryConfig.isBikeAccessible(), queryConfig.getAllowedTravelModes());
-        return serviceId + "-" + queryConfigKey;
+        return String.format("%s-%b-%b-%s", tripMaskProvider.getServiceIdForDate(date),
+                queryConfig.isWheelchairAccessible(), queryConfig.isBikeAccessible(),
+                queryConfig.getAllowedTravelModes());
     }
 
     private int[] createStopTimesForDate(LocalDate date, QueryConfig queryConfig) {