Upgraded gradle versions, fixed test locations and embedded LruDiskCache to include bug fixes that were only available in the most recent versions.