Merge "Cache location upon the prepare shutdown event." into pi-dev