Client splitted to CachedClient and StreamClient
Added FileCache