some cachedUntil and timer fixes