WIP: Don't perform stale check