Added Cache and Server layer