Updating Gregwar/Cache and using getOrCreateFile
Adding inline (fixes #44) + tests