Handle uncommitted changes and cache descriptions

No match.