Attempt to update CacheCurrentFrame plus some more updates. Not complete yet