diff --git a/lib/private/avatar.php b/lib/private/avatar.php
index 61a179810f..133ab4bcd6 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 5ed9d78f41..f2685bb3e8 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');
 	}
 
 	/**