Added some more templates + feed caching