Issue #2198339 by damiankloip: Remove cache.inc.
Issue #2197065 by sun: Adjust Simpletest module in MAINTAINERS.txt to reflect reality.