Move unrelated data outside of DatabaseTask
Renaming spree
Implement a more structured way of caching data
Miscellaneous fixes
Fix: Do not instantiate utility methods