Updated Akavache to version 4
Ditch Moq and use NSubstitute
Formatting