Improved cache timeout handling