Merge branch 'Maxim-and-Jesper'
A simple cache implementation!
Merge branch 'Maxim-and-Jesper'