In 1.8.1 the one-shot location is now using the same API to get the location which hopefully improves the situation.