Add request-scope cache support