some fixes with caching saving for files
pull method restored