Fix timeout and cache #163