Added more values to composite cacheing; fixes things that rotate without translating