Rearranged to fix follow button on cached response