Cache NotFoundRuntime fix