Move things around
Remove unused import
Remove the cache module