Deeply check if token needs recreation

Should address #11 (needs testing)