Cache methods reworked.
Merge branch 'dev'