diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,9 @@
 # Changelog for typed-uuid
 
 ## Unreleased changes
+
+## [0.0.0.2] - 2020-04-16
+
+### Changed
+
+* Upgraded the generators to be fast again after genvalidity-0.11.0.0
diff --git a/bench/Main.hs b/bench/Main.hs
new file mode 100644
--- /dev/null
+++ b/bench/Main.hs
@@ -0,0 +1,20 @@
+{-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
+
+module Main where
+
+import Criterion.Main as Criterion
+import Data.GenValidity
+import Data.GenValidity.Criterion
+import Data.GenValidity.UUID.Typed ()
+import Data.UUID.Typed
+import Test.QuickCheck
+
+main :: IO ()
+main =
+  Criterion.defaultMain
+    [ genValidBench @(UUID Int),
+      genUncheckedBench @(UUID Int),
+      genBench "valid UUID via genUnchecked" ((genUnchecked `suchThat` isValid) :: Gen (UUID Int))
+    ]
diff --git a/genvalidity-typed-uuid.cabal b/genvalidity-typed-uuid.cabal
--- a/genvalidity-typed-uuid.cabal
+++ b/genvalidity-typed-uuid.cabal
@@ -4,10 +4,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 67fbbfb8015611a23ec3e915b71021d66566e2c9584464f68952372688e14260
+-- hash: e690b1a8182d5ba11d02e71ebeba6d6df60e4ff46b2d5a384daec4988a6f5e2e
 
 name:           genvalidity-typed-uuid
-version:        0.0.0.1
+version:        0.0.0.2
 synopsis:       Generators for Phantom-Typed version of UUID
 description:    Please see the README on Github at <https://github.com/NorfairKing/typed-uuid#readme>
 category:       Data
@@ -15,7 +15,7 @@
 bug-reports:    https://github.com/NorfairKing/typed-uuid/issues
 author:         Tom Sydney Kerckhove
 maintainer:     syd@cs-syd.eu
-copyright:      Copyright: (c) 2018-2019 Tom Sydney Kerckhove
+copyright:      Copyright: (c) 2018-2020 Tom Sydney Kerckhove
 license:        MIT
 license-file:   LICENSE
 build-type:     Simple
@@ -61,4 +61,23 @@
     , genvalidity-uuid
     , hspec
     , typed-uuid
+  default-language: Haskell2010
+
+benchmark genvalidity-typed-uuid-bench
+  type: exitcode-stdio-1.0
+  main-is: Main.hs
+  other-modules:
+      Paths_genvalidity_typed_uuid
+  hs-source-dirs:
+      bench/
+  ghc-options: -Wall
+  build-depends:
+      QuickCheck
+    , base >=4.7 && <5
+    , criterion
+    , genvalidity
+    , genvalidity-criterion
+    , genvalidity-typed-uuid
+    , genvalidity-uuid >=0.0
+    , typed-uuid >=0.0
   default-language: Haskell2010
diff --git a/src/Data/GenValidity/UUID/Typed.hs b/src/Data/GenValidity/UUID/Typed.hs
--- a/src/Data/GenValidity/UUID/Typed.hs
+++ b/src/Data/GenValidity/UUID/Typed.hs
@@ -7,9 +7,13 @@
 import Data.UUID.Typed
 import Test.QuickCheck
 
-instance GenUnchecked (UUID a)
+instance GenUnchecked (UUID a) where
+  genUnchecked = UUID <$> genUnchecked
+  shrinkUnchecked (UUID u) = UUID <$> shrinkUnchecked u
 
-instance GenValid (UUID a)
+instance GenValid (UUID a) where
+  genValid = UUID <$> genValid
+  shrinkValid (UUID u) = UUID <$> shrinkValid u
 
 instance Arbitrary (UUID a) where
-    arbitrary = genValid
+  arbitrary = genValid
diff --git a/test/Data/UUID/TypedSpec.hs b/test/Data/UUID/TypedSpec.hs
--- a/test/Data/UUID/TypedSpec.hs
+++ b/test/Data/UUID/TypedSpec.hs
@@ -1,18 +1,18 @@
 {-# LANGUAGE TypeApplications #-}
 
 module Data.UUID.TypedSpec
-    ( spec
-    ) where
+  ( spec,
+  )
+where
 
+import Data.GenValidity.UUID.Typed ()
+import Data.UUID.Typed
 import Test.Hspec
 import Test.Validity
 import Test.Validity.Aeson
 
-import Data.GenValidity.UUID.Typed ()
-import Data.UUID.Typed
-
 spec :: Spec
 spec = do
-    eqSpec @(UUID Int)
-    genValidSpec @(UUID Int)
-    jsonSpec @(UUID Int)
+  eqSpecOnValid @(UUID Int)
+  genValidSpec @(UUID Int)
+  jsonSpecOnValid @(UUID Int)