Refactor Cache/Lock to DICE

- Refactor Cache classes
- Refactor Lock classes
- Improved test speed (removed some seperate class annotations)

static/dependencies.config.php

@@ -2,7 +2,9 @@
 
 use Dice\Dice;
 use Friendica\App;
+use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\Lock\ILockDriver;
 use Friendica\Database\Database;
 use Friendica\Factory;
 use Friendica\Util;
@@ -116,4 +118,19 @@ return [
 			['createDev', [], Dice::CHAIN_CALL],
 		]
 	],
+	Cache\ICacheDriver::class => [
+		'instanceOf' => Factory\CacheDriverFactory::class,
+		'call' => [
+			['create', [], Dice::CHAIN_CALL],
+		],
+	],
+	Cache\IMemoryCacheDriver::class => [
+		'instanceOf' => Cache\ICacheDriver::class,
+	],
+	ILockDriver::class => [
+		'instanceOf' => Factory\LockDriverFactory::class,
+		'call' => [
+			['create', [], Dice::CHAIN_CALL],
+		],
+	],
 ];