diff --git a/server/gitea/client.go b/server/gitea/client.go
index 943be1f..b918235 100644
--- a/server/gitea/client.go
+++ b/server/gitea/client.go
@@ -51,24 +51,15 @@ func NewClient(giteaRoot, giteaAPIToken string) (*Client, error) {
 }
 
 func (client *Client) GiteaRawContent(targetOwner, targetRepo, ref, resource string) ([]byte, error) {
-	url := joinURL(client.giteaRoot, giteaAPIRepos, targetOwner, targetRepo, "raw", resource+"?ref="+url.QueryEscape(ref))
-	res, err := client.do(client.contentTimeout, url)
+	resp, err := client.ServeRawContent(targetOwner, targetRepo, ref, resource)
 	if err != nil {
 		return nil, err
 	}
-
-	switch res.StatusCode() {
-	case fasthttp.StatusOK:
-		return res.Body(), nil
-	case fasthttp.StatusNotFound:
-		return nil, ErrorNotFound
-	default:
-		return nil, fmt.Errorf("unexpected status code '%d'", res.StatusCode())
-	}
+	return resp.Body(), nil
 }
 
-func (client *Client) ServeRawContent(uri string) (*fasthttp.Response, error) {
-	url := joinURL(client.giteaRoot, giteaAPIRepos, uri)
+func (client *Client) ServeRawContent(targetOwner, targetRepo, ref, resource string) (*fasthttp.Response, error) {
+	url := joinURL(client.giteaRoot, giteaAPIRepos, targetOwner, targetRepo, "raw", resource+"?ref="+url.QueryEscape(ref))
 	res, err := client.do(client.contentTimeout, url)
 	if err != nil {
 		return nil, err
diff --git a/server/upstream/helper.go b/server/upstream/helper.go
index 5bbe833..0714dcd 100644
--- a/server/upstream/helper.go
+++ b/server/upstream/helper.go
@@ -67,6 +67,10 @@ func (o *Options) generateUri() string {
 	return path.Join(o.TargetOwner, o.TargetRepo, "raw", o.TargetBranch, o.TargetPath)
 }
 
+func (o *Options) generateUriClientArgs() (targetOwner, targetRepo, ref, resource string) {
+	return o.TargetOwner, o.TargetRepo, o.TargetBranch, o.TargetPath
+}
+
 func (o *Options) timestamp() string {
 	return strconv.FormatInt(o.BranchTimestamp.Unix(), 10)
 }
diff --git a/server/upstream/upstream.go b/server/upstream/upstream.go
index 9b7464e..6ca7b4c 100644
--- a/server/upstream/upstream.go
+++ b/server/upstream/upstream.go
@@ -80,7 +80,7 @@ func (o *Options) Upstream(ctx *fasthttp.RequestCtx, giteaClient *gitea.Client,
 	if cachedValue, ok := fileResponseCache.Get(uri + "?timestamp=" + o.timestamp()); ok && !cachedValue.(gitea.FileResponse).IsEmpty() {
 		cachedResponse = cachedValue.(gitea.FileResponse)
 	} else {
-		res, err = giteaClient.ServeRawContent(uri)
+		res, err = giteaClient.ServeRawContent(o.generateUriClientArgs())
 	}
 	log.Debug().Msg("acquisition")