Static cacheing fix.