diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix
index 76ffaf731cfc..35cf74ca8426 100644
--- a/pkgs/development/python-modules/requests-cache/default.nix
+++ b/pkgs/development/python-modules/requests-cache/default.nix
@@ -1,21 +1,58 @@
-{ lib, buildPythonPackage, fetchPypi
-, mock, requests, six, urllib3 }:
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, attrs
+, itsdangerous
+, requests
+, url-normalize
+, pytestCheckHook
+, requests-mock
+, timeout-decorator
+}:
 
 buildPythonPackage rec {
   pname = "requests-cache";
   version = "0.6.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "dd9120a4ab7b8128cba9b6b120d8b5560d566a3cd0f828cced3d3fd60a42ec40";
+  disabled = pythonOlder "3.6";
+
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "reclosedev";
+    repo = "requests-cache";
+    rev = "v${version}";
+    sha256 = "10rvs611j16kakqx38kpqpc1v0dfb9rmbz2whpskswb1lsksv3j9";
   };
 
-  buildInputs = [ mock ];
-  propagatedBuildInputs = [ requests six urllib3 ];
+  propagatedBuildInputs = [
+    attrs
+    itsdangerous
+    requests
+    url-normalize
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    requests-mock
+    timeout-decorator
+  ];
+
+  disabledTestPaths = [
+    # connect to database on localhost
+    "tests/integration/test_cache.py"
+    "tests/integration/test_dynamodb.py"
+    "tests/integration/test_gridfs.py"
+    "tests/integration/test_mongodb.py"
+    "tests/integration/test_redis.py"
+  ];
+
+  pythonImportsCheck = [ "requests_cache" ];
 
   meta = with lib; {
     description = "Persistent cache for requests library";
-    homepage = "https://pypi.python.org/pypi/requests-cache";
+    homepage = "https://github.com/reclosedev/requests-cache";
     license = licenses.bsd3;
   };
 }