Changed to use cache now that cache clearing issue is fixed in framework