Finish (I hope) resource limiting
Use the proper contract ID for cache service