Added Timeouts and Cache