Made uncache less pointlessly restrictive