Move cache code to partial class
- allow easy management and could be switched off