Refactor feed support. Cache everything