Brings back cache implementation for validation