Tentatively fix updating cache when requested location differs from cached location