Fix renderer cache to support multilayer (token-based) keys