diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf
index f4e34f4..98b2a97 100644
--- a/gnupg/gpg-agent.conf
+++ b/gnupg/gpg-agent.conf
@@ -8,3 +8,7 @@ no-grab
 # pinentry-program /usr/bin/pinentry-kwallet
 pinentry-program /usr/bin/pinentry-gtk-2
 
+# Cache settings
+default-cache-ttl 10800
+default-cache-ttl-ssh 10800
+
diff --git a/zshrc b/zshrc
index d1e0cb7..ae1ad57 100644
--- a/zshrc
+++ b/zshrc
@@ -43,7 +43,7 @@ export GEM_HOME="$(ruby -e 'puts Gem.user_dir')"
 export EDITOR="vim"
 stty -ixon # turn of <C-s> for vimshell
 
-# GPG-agent
+# GPG ssh tty
+export GPG_TTY=$(tty)
 envoy -t gpg-agent
 source <(envoy -p)
-