Update caching, remove unused references