Rearranged rules to allow caching again