Some bugs, implementing new style caching