Added new cache system
Merge branch 'cache'