diff -r 1ac1efce6883 Src/TileStorage/u_TileFileNameGeneratorsSimpleList.pas
--- a/Src/TileStorage/u_TileFileNameGeneratorsSimpleList.pas	Tue Feb 16 19:19:38 2016 +0300
+++ b/Src/TileStorage/u_TileFileNameGeneratorsSimpleList.pas	Thu Feb 18 19:45:48 2016 +0300
@@ -50,14 +50,16 @@
   u_TileFileNameGM1,
   u_TileFileNameGM2,
   u_TileFileNameGM3,
-  u_TileFileNameMOBAC;
+  u_TileFileNameMOBAC,
+  u_TileFileNameTMS,
+  u_TileFileNameOsmAnd;
 
 { TTileFileNameGeneratorsSimpleList }
 
 constructor TTileFileNameGeneratorsSimpleList.Create;
 begin
   inherited Create;
-  SetLength(FItems, 7);
+  SetLength(FItems, 9);
   FItems[0] := TTileFileNameGMV.Create;
   FItems[1] := TTileFileNameSAS.Create;
   FItems[2] := TTileFileNameES.Create;
@@ -65,6 +67,8 @@
   FItems[4] := TTileFileNameGM2.Create;
   FItems[5] := TTileFileNameGM3.Create;
   FItems[6] := TTileFileNameMOBAC.Create;
+  FItems[7] := TTileFileNameOsmAnd.Create;
+  FItems[8] := TTileFileNameTMS.Create;
 end;
 
 destructor TTileFileNameGeneratorsSimpleList.Destroy;
@@ -111,6 +115,14 @@
     begin
       Result := FItems[6];
     end;
+    c_File_Cache_Id_OsmAnd:
+    begin
+      Result := FItems[7];
+    end;
+    c_File_Cache_Id_TMS:
+    begin
+      Result := FItems[8];
+    end;
   else begin
     Assert(False);
     Result := nil;