diff --git a/core/lib/Drupal/Core/Config/ConfigFactoryOverrideInterface.php b/core/lib/Drupal/Core/Config/ConfigFactoryOverrideInterface.php
index 0a6852d..15723ec 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactoryOverrideInterface.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactoryOverrideInterface.php
@@ -66,7 +66,7 @@ public function createConfigObject($name, $collection = StorageInterface::DEFAUL
    * Cache contexts are tokens: placeholders that are converted to cache keys by
    * the @cache_contexts_manager service. The replacement value depends on the
    * request context (the current URL, language, and so on). They're converted
-   * before storing an object in cache.
+   * before storing or retrieving an object in cache.
    *
    * @param string $name
    *   The name of the configuration object that is being constructed.
diff --git a/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideIntegrationTest.php b/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideIntegrationTest.php
index ba774bb..22d0b11 100644
--- a/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideIntegrationTest.php
+++ b/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideIntegrationTest.php
@@ -30,9 +30,9 @@ class CacheabilityMetadataConfigOverrideIntegrationTest extends WebTestBase {
   public function setUp() {
     parent::setUp();
 
-    // @discuss If our block does not contain any content then the cache context
-    // is not bubbling up and the test fails. This probably indicates a bug
-    // since the title of the block is rendered, so the context is useful.
+    // @todo If our block does not contain any content then the cache context
+    //   is not bubbling up and the test fails. Remove this line once the cache
+    //   contexts are properly set. See https://www.drupal.org/node/2529980.
     \Drupal::state()->set('block_test.content', 'Needs to have some content');
 
     $this->drupalLogin($this->drupalCreateUser());
diff --git a/core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php b/core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php
index c4c0b96..7ef6f2d 100644
--- a/core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php
+++ b/core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php
@@ -19,6 +19,12 @@ class PirateDayCacheContext implements CacheContextInterface {
 
   /**
    * The length of Pirate Day. It lasts 24 hours.
+   *
+   * This is a simplified test implementation. In a real life Pirate Day module
+   * this data wouldn't be defined in a constant, but calculated in a static
+   * method. If it were Pirate Day it should return the number of seconds until
+   * midnight, and on all other days it should return the number of seconds
+   * until the start of the next Pirate Day.
    */
   const PIRATE_DAY_MAX_AGE = 86400;