System for detection of content servers and caching popular content therein

An apparatus comprising a network interface to at least a first portion of a network and at least a second portion of a network. A deep-packet-inspection (DPI) unit identifies at least a source of content, the DPI unit further inspecting one or more packets provided from the identified at least a source of content over the first portion of the network, each packet having at least a specific source address and a specific destination address. A storage stores at least a portion of the content. A content delivery unit receives a request from the second portion of the network for requested content from the identified at least a source of content and responsive thereto provides the requested content, or portions of the requested content, from the storage to the second network if the requested content, or portions of the requested content, is stored in the storage, or otherwise sending the request over the first portion of the network to the identified at least a source of content for the requested content, or missing portions of the requested content.