Go back to regular resource class

Also, always store the cache because it should at least save us some effort
next time.