Follow-up from "WIP: Optimize consistency and state handling"

The following discussion from !1739 (merged) should be addressed:

• @tlater started a discussion: (+4 comments)

  I don't think these method names are correct.

It turns out that we don't seem to have tests that contain the sources in their own source-based cache and not in the cas.

We should write tests to ensure the behavior is correct here.