Now from 8s to 1s
Cleaned up some caching stuff which has become unneeded