Make resource cache class agnostic
Make cache class agnostic