diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Mustache library changelog
 
+## v2.4.1
+
+- Compatibility with `containers >= 0.2.17`
+
 ## v2.4.0
 
 - Support for aeson 2
diff --git a/mustache.cabal b/mustache.cabal
--- a/mustache.cabal
+++ b/mustache.cabal
@@ -5,7 +5,7 @@
 -- see: https://github.com/sol/hpack
 
 name:           mustache
-version:        2.4.0
+version:        2.4.1
 synopsis:       A mustache template parser library.
 description:    Allows parsing and rendering template files with mustache markup. See the
                 mustache <http://mustache.github.io/mustache.5.html language reference>.
diff --git a/src/Text/Mustache/Internal/Types.hs b/src/Text/Mustache/Internal/Types.hs
--- a/src/Text/Mustache/Internal/Types.hs
+++ b/src/Text/Mustache/Internal/Types.hs
@@ -394,11 +394,14 @@
 deriveLift ''Node
 deriveLift ''Template
 
+-- Data.HashMap 0.2.17.0 introduces its own Lift instance
+#if !MIN_VERSION_unordered_containers(0,2,17)
 instance Lift TemplateCache where
 #if MIN_VERSION_template_haskell(2,16,0)
   liftTyped m = [|| HM.fromList $$(liftTyped $ HM.toList m) ||]
 #else
   lift m = [| HM.fromList $(lift $ HM.toList m) |]
+#endif
 #endif
 
 --Data.Text 1.2.4.0 introduces its own Lift Text instance