Gar caching fixes :(