Issue #2157855 by jessebeach | moshe weitzman: Poorly named cache id in toolbar.