Restored GHC caching