Timestamp checking and checking for re-fetching now work correctly