diff -Nru wslu-2.3.2/debian/changelog wslu-2.3.2/debian/changelog
--- wslu-2.3.2/debian/changelog	2019-12-11 07:57:49.000000000 +0000
+++ wslu-2.3.2/debian/changelog	2019-12-11 20:33:12.000000000 +0000
@@ -1,3 +1,18 @@
+wslu (2.3.2-0ubuntu2~19.10.3) eoan; urgency=medium
+
+  * Detect X and PulseAudio in WSL2, too (LP: #1853343)
+  * debian/wsl-integration.sh: Use type instead of which for faster execution.
+    Also skip all detection steps when pactl and xvinfo are not installed.
+  * debian/wsl-integration.sh: Set timeouts for X and PulseAudio detection.
+    This fixes long startup time when detection fails after waiting for long.
+    (LP: #1855520)
+  * Cache results of detecting X and sound server in
+    $HOME/.cache/wslu/integration. (LP: #1855898)
+    Reuse results when starting new shells in the same running
+    WSL Ubuntu instance.
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 11 Dec 2019 21:33:12 +0100
+
 wslu (2.3.2-0ubuntu2~19.10.2) eoan; urgency=medium
 
   * Revert previous SRU (LP: #1855520):
diff -Nru wslu-2.3.2/debian/wsl-integration.sh wslu-2.3.2/debian/wsl-integration.sh
--- wslu-2.3.2/debian/wsl-integration.sh	2019-12-11 07:57:49.000000000 +0000
+++ wslu-2.3.2/debian/wsl-integration.sh	2019-12-11 20:33:12.000000000 +0000
@@ -1,12 +1,41 @@
-# set DISPLAY if there is an X11 server running
-if which xvinfo > /dev/null && env DISPLAY=:0 xvinfo > /dev/null 2>&1; then
-    export DISPLAY=:0
-    export LIBGL_ALWAYS_INDIRECT=1
-fi
+WSL_INTEGRATION_CACHE=$HOME/.cache/wslu/integration
+
+if find -L $WSL_INTEGRATION_CACHE -newer /etc/resolv.conf 2> /dev/null | grep -q -m 1 '.'; then
+    . $WSL_INTEGRATION_CACHE
+elif type pactl > /dev/null 2>&1 || type xvinfo > /dev/null 2>&1; then
+    # detect WSL host
+    if type systemd-detect-virt > /dev/null 2>&1 && test "$(systemd-detect-virt -c)" != wsl -a -e /etc/resolv.conf; then
+        WSL_HOST=$(awk '/nameserver / {print $2; exit}' /etc/resolv.conf 2>/dev/null)
+        WSL_HOST_X_TIMEOUT=0.2
+        WSL_HOST_PA_TIMEOUT=0.3
+    else
+        WSL_HOST=${WSL_HOST:-localhost}
+        WSL_HOST_X_TIMEOUT=0.6
+        WSL_HOST_PA_TIMEOUT=0.8
+    fi
+
+    # create emty cache
+    [ -d $HOME/.cache/wslu ] || mkdir -p $HOME/.cache/wslu
+    echo -n "" > $WSL_INTEGRATION_CACHE
 
-# set up audio if pulse server is reachable only via tcp
-if which pactl > /dev/null \
-        && (! pactl info > /dev/null 2>&1 || pactl info 2> /dev/null | grep -q 'Default Sink: auto_null' ) \
-        && env PULSE_SERVER=tcp:localhost pactl info > /dev/null 2>&1; then
-    export PULSE_SERVER=tcp:localhost
+    # set DISPLAY if there is an X11 server running
+    if type xvinfo > /dev/null 2>&1 && env DISPLAY=${WSL_HOST}:0 timeout $WSL_HOST_X_TIMEOUT xvinfo > /dev/null 2>&1; then
+        export DISPLAY=${WSL_HOST}:0
+        export LIBGL_ALWAYS_INDIRECT=1
+        echo -e "export DISPLAY=$DISPLAY\nexport LIBGL_ALWAYS_INDIRECT=1" >> $WSL_INTEGRATION_CACHE
+    fi
+
+    # set up audio if pulse server is reachable only via tcp
+    if type pactl > /dev/null 2>&1 \
+           && (! timeout $WSL_HOST_PA_TIMEOUT pactl info > /dev/null 2>&1 || timeout $WSL_HOST_PA_TIMEOUT pactl info 2> /dev/null | grep -q 'Default Sink: auto_null' ) \
+           && env PULSE_SERVER=tcp:${WSL_HOST} timeout $WSL_HOST_PA_TIMEOUT pactl info > /dev/null 2>&1; then
+        export PULSE_SERVER=tcp:${WSL_HOST}
+        echo -e "export PULSE_SERVER=$PULSE_SERVER" >> $WSL_INTEGRATION_CACHE
+    fi
+
+    unset WSL_HOST
+    unset WSL_HOST_X_TIMEOUT
+    unset WSL_HOST_PA_TIMEOUT
 fi
+
+unset WSLU_INTEGRATION_CACHE