Fix getCachedLocation