diff --git a/cmd/cmd.go b/cmd/cmd.go
index 47f32fa3..afec3be0 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -9,7 +9,6 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"path/filepath"
 	"strings"
 	"time"
 
@@ -24,15 +23,6 @@ import (
 	"github.com/jmorganca/ollama/server"
 )
 
-func cacheDir() string {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		panic(err)
-	}
-
-	return filepath.Join(home, ".ollama")
-}
-
 func create(cmd *cobra.Command, args []string) error {
 	filename, _ := cmd.Flags().GetString("file")
 	client := api.NewClient()
@@ -292,10 +282,6 @@ func NewCLI() *cobra.Command {
 		CompletionOptions: cobra.CompletionOptions{
 			DisableDefaultCmd: true,
 		},
-		PersistentPreRunE: func(_ *cobra.Command, args []string) error {
-			// create the models directory and it's parent
-			return os.MkdirAll(filepath.Join(cacheDir(), "models"), 0o700)
-		},
 	}
 
 	cobra.EnableCommandSorting = false
diff --git a/server/modelpath.go b/server/modelpath.go
index a7f54d57..26d2101a 100644
--- a/server/modelpath.go
+++ b/server/modelpath.go
@@ -106,10 +106,10 @@ func GetBlobsPath(digest string) (string, error) {
 		return "", err
 	}
 
-	path := filepath.Join(home, ".ollama", "models", "blobs")
+	path := filepath.Join(home, ".ollama", "models", "blobs", digest)
 	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
 		return "", err
 	}
 
-	return filepath.Join(path, digest), nil
+	return path, nil
 }