Merge branch '15-caching-impl' into 'master'

Added the cache mechanism. Updated the README as well to add some explainations.

Closes #15

See merge request !13