Tighten the timer
Fix broken, unused property resulting in warning
Fix an edge case in caching