other edits look good and this wasn't blocking so will merge and assume you can sort out caching later (i cared much less once i realized we'd only hit it only for domains with a custom logo set)