Better test stuff and a content cache fix.