Caching not working properly for various reasons, removed for now