Removed leftovers, caching slightly altered