Improvements and bug fixes 

Error handling in case of a corrupted cache file