diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php
index 9eb7069166e4f065182f49402e7b7e5fb3685c2a..5ddd80c45af7de44ea42ba1c7887ea7ef8e4c340 100644
--- a/core/avatar/avatarcontroller.php
+++ b/core/avatar/avatarcontroller.php
@@ -209,8 +209,7 @@ class AvatarController extends Controller {
 
 		$resp = new DataDisplayResponse($image->data(),
 				Http::STATUS_OK,
-				['Content-Type' => $image->mimeType(),
-				 'Pragma' => 'public']);
+				['Content-Type' => $image->mimeType()]);
 
 		$resp->setETag(crc32($image->data()));
 		$resp->cacheFor(0);
diff --git a/lib/private/avatar.php b/lib/private/avatar.php
index 61a179810f20c195faf5ace9ac601a4fe6b04bad..133ab4bcd619ca0e0f53f7fd0440c034e7ab06af 100644
--- a/lib/private/avatar.php
+++ b/lib/private/avatar.php
@@ -90,6 +90,7 @@ class Avatar implements \OCP\IAvatar {
 	 * @return void
 	*/
 	public function set ($data) {
+
 		if($data instanceOf \OCP\IImage) {
 			$img = $data;
 			$data = $img->data();
diff --git a/lib/private/server.php b/lib/private/server.php
index 5ed9d78f41b9b349ee6214c0a7915ed954fa3b06..f2685bb3e8ac3cd180d6a8cd37938225a045f88f 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -218,8 +218,8 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('AppHelper', function ($c) {
 			return new \OC\AppHelper();
 		});
-		$this->registerService('NullCache', function ($c) {
-			return new NullCache();
+		$this->registerService('UserCache', function ($c) {
+			return new Cache\File();
 		});
 		$this->registerService('MemCacheFactory', function (Server $c) {
 			$config = $c->getConfig();
@@ -667,7 +667,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
 	 */
 	public function getCache() {
-		return $this->query('NullCache');
+		return $this->query('UserCache');
 	}
 
 	/**
diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php
index 8fd5fdd8f537271cc15585831aeecf3c5440fc0c..f6c9460ff156d1fccefd084818cbb6e889d25508 100644
--- a/lib/public/appframework/http/response.php
+++ b/lib/public/appframework/http/response.php
@@ -94,7 +94,7 @@ class Response {
 			$this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds .
 				', must-revalidate');
 		} else {
-			$this->addHeader('Cache-Control', 'no-cache, must-revalidate');
+			$this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
 		}
 
 		return $this;
diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php
index 77e9441b52cad59e8483f3fc1adb5d2ad0bb026a..c8b79fbd8b6b28eaf4287acb97de052a442f7742 100644
--- a/tests/lib/appframework/http/ResponseTest.php
+++ b/tests/lib/appframework/http/ResponseTest.php
@@ -221,7 +221,7 @@ class ResponseTest extends \Test\TestCase {
 		$this->childResponse->cacheFor(0);
 
 		$headers = $this->childResponse->getHeaders();
-		$this->assertEquals('no-cache, must-revalidate', $headers['Cache-Control']);
+		$this->assertEquals('no-cache, no-store, must-revalidate', $headers['Cache-Control']);
 	}
 
 
diff --git a/tests/lib/server.php b/tests/lib/server.php
index 9d45d069b6c321d1fca297b27e12439d819270f7..f2971fea25d49c82c8756e53c8d4584213cbdf29 100644
--- a/tests/lib/server.php
+++ b/tests/lib/server.php
@@ -98,9 +98,7 @@ class Server extends \Test\TestCase {
 
 			['NavigationManager', '\OC\NavigationManager'],
 			['NavigationManager', '\OCP\INavigationManager'],
-			['NullCache', '\OC\Memcache\NullCache'],
-			['NullCache', '\OC\Memcache\Cache'],
-			['NullCache', '\OCP\IMemcache'],
+			['UserCache', '\OC\Cache\File'],
 
 			['OcsClient', '\OC\OCSClient'],