Improved API, a lot of renaming
Implemented a new, annotation-based cache API