Increase default cache timeout, fix cache generation