Making the tests pass with cache everywhere.
Resolving merge conflicts.