diff --git a/lib/core.sh b/lib/core.sh
index 1cfb980..354a20e 100644
--- a/lib/core.sh
+++ b/lib/core.sh
@@ -96,7 +96,7 @@ function bashio::core() {
     fi
 
     if bashio::cache.exists 'core.info'; then
-        info=$(bashio::cache.get 'supervisor.core')
+        info=$(bashio::cache.get 'core.info')
     else
         info=$(bashio::api.supervisor GET /core/info false)
         bashio::cache.set 'core.info' "${info}"
diff --git a/lib/info.sh b/lib/info.sh
index 809d28e..c002554 100644
--- a/lib/info.sh
+++ b/lib/info.sh
@@ -15,7 +15,7 @@
 #   $2 jq Filter to apply on the result (optional)
 # ------------------------------------------------------------------------------
 function bashio::info() {
-    local cache_key=${1:-'supervisor.info'}
+    local cache_key=${1:-'info'}
     local filter=${2:-}
     local info
     local response
@@ -27,11 +27,11 @@ function bashio::info() {
         return "${__BASHIO_EXIT_OK}"
     fi
 
-    if bashio::cache.exists 'supervisor.info'; then
-        info=$(bashio::cache.get 'supervisor.info')
+    if bashio::cache.exists 'info'; then
+        info=$(bashio::cache.get 'info')
     else
         info=$(bashio::api.supervisor GET /info false)
-        bashio::cache.set 'supervisor.info' "${info}"
+        bashio::cache.set 'info' "${info}"
     fi
 
     response="${info}"
diff --git a/lib/os.sh b/lib/os.sh
index 7c00c1e..f4e1233 100644
--- a/lib/os.sh
+++ b/lib/os.sh
@@ -56,7 +56,7 @@ function bashio::os() {
     fi
 
     if bashio::cache.exists 'os.info'; then
-        info=$(bashio::cache.get 'supervisor.os')
+        info=$(bashio::cache.get 'os.info')
     else
         info=$(bashio::api.supervisor GET /os/info false)
         bashio::cache.set 'os.info' "${info}"