updated caching times and removed static templates