removing CachedLocation code as it was causing problems.
Resolver shouldn't validate_cached when the location is nil
#718