Add support for cacheTimeout