Attempt to get more things and caching working