diff --git a/addon/lib/field.js b/addon/lib/field.js
index 914227999..d700c921f 100644
--- a/addon/lib/field.js
+++ b/addon/lib/field.js
@@ -442,12 +442,12 @@ export default Base.extend({
    * @return {Object|Boolean} Returns an object if invalid or true if valid
    * @internal
    */
-  _validateTextQuestion() {
+  async _validateTextQuestion() {
     return [
-      ...this.validator.validate(
+      ...(await this.validator.validate(
         this.get("answer.value"),
         this.getWithDefault("question.meta.formatValidators", [])
-      ),
+      )),
       validate("length", this.get("answer.value"), {
         max: this.get("question.textMaxLength") || Number.POSITIVE_INFINITY
       })
@@ -462,12 +462,12 @@ export default Base.extend({
    * @return {Object|Boolean} Returns an object if invalid or true if valid
    * @internal
    */
-  _validateTextareaQuestion() {
+  async _validateTextareaQuestion() {
     return [
-      ...this.validator.validate(
+      ...(await this.validator.validate(
         this.get("answer.value"),
         this.getWithDefault("question.meta.formatValidators", [])
-      ),
+      )),
       validate("length", this.get("answer.value"), {
         max: this.get("question.textareaMaxLength") || Number.POSITIVE_INFINITY
       })
diff --git a/addon/services/validator.js b/addon/services/validator.js
index de1c5c6cf..ca0b9a0df 100644
--- a/addon/services/validator.js
+++ b/addon/services/validator.js
@@ -1,32 +1,28 @@
 import Service from "@ember/service";
 import { task } from "ember-concurrency";
 import allFormatValidatorsQuery from "ember-caluma/gql/queries/all-format-validators";
-import { computed } from "@ember/object";
 import { assert } from "@ember/debug";
 import { ObjectQueryManager } from "ember-apollo-client";
-import { next } from "@ember/runloop";
 
 export default Service.extend(ObjectQueryManager, {
-  init() {
-    this._super(...arguments);
-
-    next(this._fetchValidators, "perform");
-  },
-
   /**
    * Tests a value against one or multiple regular expressions.
    *
    * ```js
-   * this.validator.validate("foo@example.com", ["email", "lowercase"]);
+   * await this.validator.validate("foo@example.com", ["email", "lowercase"]);
    * ```
+   *
    * @param {String} value The value to be tested.
    * @param {String[]} slugs A list of tests (via slug) to run.
+   * @return {RSVP.Promise}
    */
-  validate(value, slugs) {
+  async validate(value, slugs) {
+    const validators =
+      this.get("validators.lastSuccessful.value") ||
+      (await this.validators.perform());
+
     return slugs.map(slug => {
-      const validator = this.validators.find(
-        validator => validator.slug === slug
-      );
+      const validator = validators.find(validator => validator.slug === slug);
 
       assert(`No validator found with the slug "${slug}".`, validator);
 
@@ -41,20 +37,13 @@ export default Service.extend(ObjectQueryManager, {
     });
   },
 
-  _fetchValidators: task(function*() {
-    return yield this.apollo.query(
+  validators: task(function*() {
+    const raw = yield this.apollo.query(
       { query: allFormatValidatorsQuery },
       "allFormatValidators.edges"
     );
-  }),
-
-  validators: computed("_fetchValidators.lastSuccessful.value.[]", function() {
-    const rawValidators = this.getWithDefault(
-      "_fetchValidators.lastSuccessful.value",
-      []
-    );
 
-    return rawValidators.map(rawValidator => {
+    return raw.map(rawValidator => {
       return {
         slug: rawValidator.node.slug,
         regex: new RegExp(rawValidator.node.regex),
diff --git a/tests/helpers/validator-service-stub.js b/tests/helpers/validator-service-stub.js
index aefb581f7..a8ab8db21 100644
--- a/tests/helpers/validator-service-stub.js
+++ b/tests/helpers/validator-service-stub.js
@@ -1,7 +1,7 @@
 import Service from "@ember/service";
 
 export default Service.extend({
-  validate() {
+  async validate() {
     return [true];
   }
 });
diff --git a/tests/integration/components/cf-field-test.js b/tests/integration/components/cf-field-test.js
index 7bee173f0..528dbf432 100644
--- a/tests/integration/components/cf-field-test.js
+++ b/tests/integration/components/cf-field-test.js
@@ -3,7 +3,6 @@ import { setupRenderingTest } from "ember-qunit";
 import { render, fillIn } from "@ember/test-helpers";
 import hbs from "htmlbars-inline-precompile";
 import Document from "ember-caluma/lib/document";
-import { settled } from "@ember/test-helpers";
 import setupMirage from "ember-cli-mirage/test-support/setup-mirage";
 
 module("Integration | Component | cf-field", function(hooks) {
@@ -11,7 +10,10 @@ module("Integration | Component | cf-field", function(hooks) {
   setupMirage(hooks);
 
   hooks.beforeEach(function() {
-    this.server.create("format-validator", { slug: "email", regex: "/@/" });
+    this.validator = this.server.create("format-validator", {
+      slug: "email",
+      regex: "/@/"
+    });
 
     const form = {
       __typename: "Form",
@@ -120,15 +122,12 @@ module("Integration | Component | cf-field", function(hooks) {
 
   test("it shows error message", async function(assert) {
     assert.expect(1);
-    let service = this.owner.lookup("service:validator");
-    await settled();
-    let error = service.validators.find(i => i.slug === "email").errorMsg;
 
     await render(hbs`{{cf-field field=errorField}}`);
 
     await fillIn("input", "Test");
 
-    assert.dom("span.validation-errors").hasText(error);
+    assert.dom("span.validation-errors").hasText(this.validator.errorMsg);
   });
 
   test("it saves the valid email address", async function(assert) {
diff --git a/tests/unit/services/validator-test.js b/tests/unit/services/validator-test.js
index 235848aed..cab36b6ef 100644
--- a/tests/unit/services/validator-test.js
+++ b/tests/unit/services/validator-test.js
@@ -1,7 +1,6 @@
 import { module, test } from "qunit";
 import { setupTest } from "ember-qunit";
 import { setupMirage } from "ember-cli-mirage/test-support";
-import { settled } from "@ember/test-helpers";
 
 module("Unit | Service | validator", function(hooks) {
   setupTest(hooks);
@@ -11,18 +10,13 @@ module("Unit | Service | validator", function(hooks) {
     this.server.create("format-validator", { slug: "email", regex: ".+" });
   });
 
-  test("it exists", function(assert) {
-    assert.expect(1);
-    let service = this.owner.lookup("service:validator");
-    assert.ok(service);
-  });
-
   test("slugs are in a string not in an array", async function(assert) {
     assert.expect(1);
-    this.server.logging = true;
+
     let service = this.owner.lookup("service:validator");
-    await settled();
-    let result = service.validate("test@test.com", ["email"]);
-    assert.deepEqual(result, [true]);
+
+    assert.deepEqual(await service.validate("test@test.com", ["email"]), [
+      true
+    ]);
   });
 });