fix cache issue
fixes and extendable