diff --git a/templates/definition/tariff/energypriceforecast.yaml b/templates/definition/tariff/energypriceforecast.yaml
index dec09964d..e29fc1694 100644
--- a/templates/definition/tariff/energypriceforecast.yaml
+++ b/templates/definition/tariff/energypriceforecast.yaml
@@ -31,7 +31,7 @@ params:
 render: |
   type: custom
   {{ include "base" . }}
-  {{ include "features" . }}
+  {{ include "features" (merge (dict "basefeatures" (list "cacheable")) .) }}
   forecast:
     source: http
     uri: https://api.energypriceforecast.eu/api/v1/evcc/tariff?country={{.region}}&type=grid&currency={{.currency}}&hours={{.horizon}}
diff --git a/templates/definition/tariff/features.tpl b/templates/definition/tariff/features.tpl
index 5748394eb..6ef396212 100644
--- a/templates/definition/tariff/features.tpl
+++ b/templates/definition/tariff/features.tpl
@@ -1,5 +1,11 @@
 {{ define "features" }}
+{{- if or .basefeatures (eq .average "true") }}
+features:
+{{- range .basefeatures }}
+- {{ . }}
+{{- end }}
 {{- if eq .average "true" }}
-features: ["average"]
+- average
+{{- end }}
 {{- end }}
 {{- end }}