Use FormCache everywhere

tests/utils/test_form_cache.py

@@ -1,15 +1,21 @@
+import pytest
 from werkzeug.datastructures import ImmutableDict
 
-from atst.utils.form_cache import DEFAULT_CACHE_NAME, cache_form_data, retrieve_form_data
+from atst.utils.form_cache import DEFAULT_CACHE_NAME, FormCache
 
-def test_cache_form_data(app):
+
+@pytest.fixture
+def form_cache(app):
+    return FormCache(app.redis)
+
+def test_cache_form_data(app, form_cache):
     data = ImmutableDict({"kessel_run": "12 parsecs"})
-    key = cache_form_data(app.redis, data)
+    key = form_cache.write(data)
     assert app.redis.get("{}:{}".format(DEFAULT_CACHE_NAME, key))
 
 
-def test_retrieve_form_data(app):
+def test_retrieve_form_data(form_cache):
     data = ImmutableDict({"class": "corellian"})
-    key = cache_form_data(app.redis, data)
-    retrieved = retrieve_form_data(app.redis, key)
+    key = form_cache.write(data)
+    retrieved = form_cache.read(key)
     assert retrieved == data