cache fix, check for time