Add read cache file function
Remove todo comments