Move the cachekey method into a classmethod of the channel, that way it'll be cleaner when we add more channel types
Cleanup whitespace