minor cleanup in cache/options