Switch to unified view

a/TODO b/TODO
1
- Rewrite. Maybe even in C?
1
- Rewrite. Maybe even in C?
2
- Write test cases for cache, as it seems to contain duplicates in some cases..
2
- Write test cases for cache, as it seems to contain duplicates in some cases..
3
- Pass instances around instead of using globals