removed some extra baggage for caching